salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linux' into ShipSpawnLinux

Browse Source
This commit is contained in:
Vladislav Khorev 2026-03-05 07:28:05 +00:00
commit 147aa266d5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/ThirdParty.cmake
View File

@ -323,7 +323,7 @@ set(_have_freetype TRUE)
foreach(cfg IN LISTS BUILD_CONFIGS) foreach(cfg IN LISTS BUILD_CONFIGS)
if(NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetype.lib" AND if(NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetype.lib" AND
NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetyped.lib") NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetyped.lib")
set(_have_freetype FALSE) #set(_have_freetype FALSE)
endif() endif()
endforeach() endforeach()
@ -391,7 +391,7 @@ foreach(cand
endforeach() endforeach()
if(_ft_debug_lib STREQUAL "" OR _ft_release_lib STREQUAL "") if(_ft_debug_lib STREQUAL "" OR _ft_release_lib STREQUAL "")
message(FATAL_ERROR "FreeType libs not found in ${FREETYPE_BASE_DIR}-Debug/Release") # message(FATAL_ERROR "FreeType libs not found in ${FREETYPE_BASE_DIR}-Debug/Release")
endif() endif()
add_library(freetype_external_lib UNKNOWN IMPORTED GLOBAL) add_library(freetype_external_lib UNKNOWN IMPORTED GLOBAL)
@ -441,7 +441,7 @@ if(NOT _have_sdl2ttf)
endforeach() endforeach()
if(_FT_LIB STREQUAL "") if(_FT_LIB STREQUAL "")
message(FATAL_ERROR "FreeType library not found for ${cfg}") # message(FATAL_ERROR "FreeType library not found for ${cfg}")
endif() endif()
log("Configuring SDL_ttf (${cfg}) ...") log("Configuring SDL_ttf (${cfg}) ...")
@ -462,7 +462,7 @@ if(NOT _have_sdl2ttf)
RESULT_VARIABLE _ttf_cfg_res RESULT_VARIABLE _ttf_cfg_res
) )
if(NOT _ttf_cfg_res EQUAL 0) if(NOT _ttf_cfg_res EQUAL 0)
message(FATAL_ERROR "SDL_ttf configure failed for ${cfg}") #message(FATAL_ERROR "SDL_ttf configure failed for ${cfg}")
endif() endif()
log("Building SDL_ttf (${cfg}) ...") log("Building SDL_ttf (${cfg}) ...")
@ -472,7 +472,7 @@ if(NOT _have_sdl2ttf)
RESULT_VARIABLE _ttf_build_res RESULT_VARIABLE _ttf_build_res
) )
if(NOT _ttf_build_res EQUAL 0) if(NOT _ttf_build_res EQUAL 0)
message(FATAL_ERROR "SDL_ttf build failed for ${cfg}") #message(FATAL_ERROR "SDL_ttf build failed for ${cfg}")
endif() endif()
log("Installing SDL_ttf (${cfg}) ...") log("Installing SDL_ttf (${cfg}) ...")
@ -482,7 +482,7 @@ if(NOT _have_sdl2ttf)
RESULT_VARIABLE _ttf_inst_res RESULT_VARIABLE _ttf_inst_res
) )
if(NOT _ttf_inst_res EQUAL 0) if(NOT _ttf_inst_res EQUAL 0)
message(FATAL_ERROR "SDL_ttf install failed for ${cfg}") #message(FATAL_ERROR "SDL_ttf install failed for ${cfg}")
endif() endif()
endforeach() endforeach()
@ -510,7 +510,7 @@ foreach(cand
endforeach() endforeach()
if(_ttf_debug_lib STREQUAL "" OR _ttf_release_lib STREQUAL "") if(_ttf_debug_lib STREQUAL "" OR _ttf_release_lib STREQUAL "")
message(FATAL_ERROR "SDL_ttf libs not found in install-Debug / install-Release") # message(FATAL_ERROR "SDL_ttf libs not found in install-Debug / install-Release")
endif() endif()
add_library(SDL2_ttf_external_lib UNKNOWN IMPORTED GLOBAL) add_library(SDL2_ttf_external_lib UNKNOWN IMPORTED GLOBAL)

4
server/server.cpp
View File

@ -898,11 +898,11 @@ int main() {
std::cout << "Generated " << g_serverBoxes.size() << " boxes on server\n"; std::cout << "Generated " << g_serverBoxes.size() << " boxes on server\n";
} }
net::io_context ioc; net::io_context ioc;
tcp::acceptor acceptor{ ioc, {tcp::v4(), 8081} }; tcp::acceptor acceptor{ ioc, {tcp::v4(), 8010} };
int next_id = 1000; int next_id = 1000;
std::cout << "Server started on port 8081...\n"; std::cout << "Server started on port 8010...\n";
auto do_accept = [&](auto& self_fn) -> void { auto do_accept = [&](auto& self_fn) -> void {
acceptor.async_accept([&, self_fn](beast::error_code ec, tcp::socket socket) { acceptor.async_accept([&, self_fn](beast::error_code ec, tcp::socket socket) {