From 25b94ab2d81376a6298e8fb8680014c1b612500d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 5 May 2022 17:25:13 +0800 Subject: [PATCH 1/2] 1 --- server/textserver/CMakeLists.txt | 9 ++++++++- third_party/a8engine | 2 +- third_party/framework | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/textserver/CMakeLists.txt b/server/textserver/CMakeLists.txt index c7725a7..2f8d246 100644 --- a/server/textserver/CMakeLists.txt +++ b/server/textserver/CMakeLists.txt @@ -3,6 +3,13 @@ cmake_minimum_required(VERSION 2.8) set(GAME_ID 9002) +if (${LIB_DIR}) + message(LIB_DIR: ${LIB_DIR}) +else() + set(LIB_DIR ) + message(LIB_DIR: ${LIB_DIR} ) +endif() + if (${RELEASE}) set(CMAKE_BUILD_TYPE "Release") message("release mode") @@ -32,7 +39,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 diff --git a/third_party/a8engine b/third_party/a8engine index adcd7a7..600bba2 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit adcd7a71ae0d085df858585bef5df69270b01c86 +Subproject commit 600bba2be22c46844b15e8b728dd00bec55e51c2 diff --git a/third_party/framework b/third_party/framework index 00ee11c..3390412 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit 00ee11c757204f61ba450656c381293b9e0b0bbd +Subproject commit 3390412e54cef4964d65f6f686b56b7fc7e0ea7b From de732c6dea3e02b7e2a16542c45d48ec0a8410ea Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 5 May 2022 17:29:26 +0800 Subject: [PATCH 2/2] 1 --- third_party/behaviac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/behaviac b/third_party/behaviac index 2404145..5beca57 160000 --- a/third_party/behaviac +++ b/third_party/behaviac @@ -1 +1 @@ -Subproject commit 240414570ee2848291d24ff8d3102dc43d4104a3 +Subproject commit 5beca57f6555aa0d9e4de71c93653cade928a654