diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt index 62980c3..48bca2e 100644 --- a/server/wsproxy/CMakeLists.txt +++ b/server/wsproxy/CMakeLists.txt @@ -4,30 +4,11 @@ cmake_minimum_required(VERSION 2.8) if (${GAME_ID}) message(GAME_ID: ${GAME_ID}) else() - set(GAME_ID 1008) - message(GAME_ID: ${GAME_ID}) + message(FATAL_ERROR "GAME_ID error") endif() -if (${LIB_DIR}) - message(LIB_DIR: ${LIB_DIR}) -else() - set(LIB_DIR ) - message(LIB_DIR: ${LIB_DIR} ) -endif() - -if (${MASTER_MODE}) - message(MASTER_MODE: 1) -else() - set(MASTER_MODE 0) - message(MASTER_MODE: 0) -endif() - -if (${ASYNC_TCPCLIENT}) - message(ASYNC_TCPCLIENT: 1) -else() - set(ASYNC_TCPCLIENT 0) - message(ASYNC_TCPCLIENT: 0) -endif() +set(LIB_DIR "ubuntu20.04_g++-9") +message(LIB_DIR: ${LIB_DIR}) if (${RELEASE}) set(CMAKE_BUILD_TYPE "Release") @@ -36,12 +17,17 @@ else() set(CMAKE_BUILD_TYPE "Debug") message("debug mode") endif() -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DASYNC_TCPCLIENT=${ASYNC_TCPCLIENT} -DNDEBUG") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DASYNC_TCPCLIENT=${ASYNC_TCPCLIENT} -DDEBUG") + +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG") +if (${ASAN}) + set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -fsanitize=address -fno-omit-frame-pointer") +else() + set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG") +endif() include_directories( AFTER - ../../third_party/a8engine + ../../third_party/a8 /usr/include/mysql /usr/include/jsoncpp /usr/include/hiredis @@ -60,11 +46,11 @@ link_directories( ../../third_party/behaviac/lib/${LIB_DIR} ) -aux_source_directory(../../third_party/a8engine/a8 +aux_source_directory(../../third_party/a8/a8 SRC_LIST ) -aux_source_directory(../../third_party/framework/cpp +aux_source_directory(../../third_party/f8/f8 SRC_LIST ) @@ -138,3 +124,16 @@ else() behaviac_gcc_release ) endif() + +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + target_link_libraries( + wsproxy${GAME_ID} + behaviac_gcc_debug + ) +else() + target_link_libraries( + wsproxy${GAME_ID} + tcmalloc + behaviac_gcc_release + ) +endif() diff --git a/third_party/behaviac b/third_party/behaviac index 5beca57..8cd7e24 160000 --- a/third_party/behaviac +++ b/third_party/behaviac @@ -1 +1 @@ -Subproject commit 5beca57f6555aa0d9e4de71c93653cade928a654 +Subproject commit 8cd7e2432785bf4027e89c5dc74cb4980e4cd3c1 diff --git a/third_party/recastnavigation b/third_party/recastnavigation index 35ca2ea..0165dc2 160000 --- a/third_party/recastnavigation +++ b/third_party/recastnavigation @@ -1 +1 @@ -Subproject commit 35ca2eadc32161cd6ab479d1a2626759a73bb5a3 +Subproject commit 0165dc279d62af5536f122ea30c3cd3f642f34ee diff --git a/third_party/tools b/third_party/tools index 04a0bc9..d38ce0b 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit 04a0bc939eeae0090fd0e8964dddf3863a551154 +Subproject commit d38ce0b86c7b9262391f48108d808ddb62854760