From 62269c7e9222842e5d86eec6f344ea626c50dc0c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 7 Mar 2022 13:57:39 +0800 Subject: [PATCH] 1 --- server/gameserver/CMakeLists.txt | 12 ++++++++++-- third_party/behaviac | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index f011b5a5..e3e9897e 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -10,6 +10,14 @@ else() set(CMAKE_BUILD_TYPE "Debug") message("debug mode") endif() + +if (${LIB_DIR}) + message(LIB_DIR: ${LIB_DIR}) +else() + set(LIB_DIR ) + message(LIB_DIR: ${LIB_DIR} ) +endif() + set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DNDEBUG") #set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DNDEBUG -fsanitize=address -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DDEBUG -fsanitize=address -fno-omit-frame-pointer") @@ -33,7 +41,7 @@ include_directories( link_directories( /usr/lib64/mysql /usr/local/lib - ../../third_party/behaviac/lib + ../../third_party/behaviac/lib/${LIB_DIR} ) aux_source_directory(../../third_party/a8engine/a8 @@ -109,7 +117,7 @@ target_link_libraries( if (CMAKE_BUILD_TYPE STREQUAL "Debug") target_link_libraries( gameserver${GAME_ID} - behaviac_gcc_debug + behaviac_gcc_release ) else() target_link_libraries( diff --git a/third_party/behaviac b/third_party/behaviac index 24041457..5beca57f 160000 --- a/third_party/behaviac +++ b/third_party/behaviac @@ -1 +1 @@ -Subproject commit 240414570ee2848291d24ff8d3102dc43d4104a3 +Subproject commit 5beca57f6555aa0d9e4de71c93653cade928a654