diff --git a/cmake/ThirdParty.cmake b/cmake/ThirdParty.cmake index 5ba633a..3697425 100644 --- a/cmake/ThirdParty.cmake +++ b/cmake/ThirdParty.cmake @@ -323,7 +323,7 @@ set(_have_freetype TRUE) foreach(cfg IN LISTS BUILD_CONFIGS) if(NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetype.lib" AND NOT EXISTS "${FREETYPE_BASE_DIR}-${cfg}/lib/freetyped.lib") - set(_have_freetype FALSE) + #set(_have_freetype FALSE) endif() endforeach() @@ -391,7 +391,7 @@ foreach(cand endforeach() 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() add_library(freetype_external_lib UNKNOWN IMPORTED GLOBAL) @@ -441,7 +441,7 @@ if(NOT _have_sdl2ttf) endforeach() if(_FT_LIB STREQUAL "") - message(FATAL_ERROR "FreeType library not found for ${cfg}") + # message(FATAL_ERROR "FreeType library not found for ${cfg}") endif() log("Configuring SDL_ttf (${cfg}) ...") @@ -462,7 +462,7 @@ if(NOT _have_sdl2ttf) RESULT_VARIABLE _ttf_cfg_res ) 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() log("Building SDL_ttf (${cfg}) ...") @@ -472,7 +472,7 @@ if(NOT _have_sdl2ttf) RESULT_VARIABLE _ttf_build_res ) 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() log("Installing SDL_ttf (${cfg}) ...") @@ -482,7 +482,7 @@ if(NOT _have_sdl2ttf) RESULT_VARIABLE _ttf_inst_res ) 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() endforeach() @@ -510,7 +510,7 @@ foreach(cand endforeach() 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() add_library(SDL2_ttf_external_lib UNKNOWN IMPORTED GLOBAL) @@ -546,4 +546,4 @@ if(NOT TARGET boost_external_lib) add_library(boost_external_lib INTERFACE) # Boost заголовки находятся непосредственно в корне распакованной папки target_include_directories(boost_external_lib INTERFACE "${BOOST_SRC_DIR}") -endif() \ No newline at end of file +endif() diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 641ed8d..389c70e 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -45,4 +45,4 @@ if(WIN32) endif() # Дополнительный макрос, чтобы Asio знал, что мы работаем без устаревших функций -target_compile_definitions(Server PRIVATE BOOST_ASIO_NO_DEPRECATED) \ No newline at end of file +target_compile_definitions(Server PRIVATE BOOST_ASIO_NO_DEPRECATED) diff --git a/server/server.cpp b/server/server.cpp index 2a498b0..d6284a0 100644 --- a/server/server.cpp +++ b/server/server.cpp @@ -898,11 +898,11 @@ int main() { std::cout << "Generated " << g_serverBoxes.size() << " boxes on server\n"; } net::io_context ioc; - tcp::acceptor acceptor{ ioc, {tcp::v4(), 8081} }; + tcp::acceptor acceptor{ ioc, {tcp::v4(), 8010} }; 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 { acceptor.async_accept([&, self_fn](beast::error_code ec, tcp::socket socket) { @@ -923,4 +923,4 @@ int main() { std::cerr << "Error: " << e.what() << std::endl; } return 0; -} \ No newline at end of file +}