server_common/masterserver
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.kingsome.cn:server_common/masterserver

Browse Source
This commit is contained in:
aozhiwei 2022-05-26 20:27:28 +08:00
commit f797e73be9
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/masterserver/CMakeLists.txt
View File

@ -15,6 +15,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_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DDEBUG")
@ -28,6 +36,7 @@ include_directories(
/usr/include/glm
../../third_party
../../third_party/behaviac/inc
../../third_party/recastnavigation/Recast/Include
../../third_party/recastnavigation/Detour/Include
../../third_party/recastnavigation/DetourTileCache/Include
.
@ -36,7 +45,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
@ -47,6 +56,10 @@ aux_source_directory(../../third_party/framework/cpp
SRC_LIST
)
aux_source_directory(../../third_party/recastnavigation/Recast/Source
SRC_LIST
)
aux_source_directory(../../third_party/recastnavigation/Detour/Source
SRC_LIST
)
@ -97,7 +110,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
hiredis
tinyxml2
tcmalloc
behaviac_gcc_debug
behaviac_gcc_release
)
else()
target_link_libraries(

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit cdb87a3e673aee3401b3e2ffce3ea1a1e6a603b0
Subproject commit 9c890ba78e289d4879f921b94b558e10d66b2b64

2
third_party/behaviac vendored

@ -1 +1 @@
Subproject commit 240414570ee2848291d24ff8d3102dc43d4104a3
Subproject commit 5beca57f6555aa0d9e4de71c93653cade928a654

2
third_party/framework vendored

@ -1 +1 @@
Subproject commit eb455bb95f97dc506566c443be0c72960ceebabf
Subproject commit 180f9e3f5cdad81a58fe4f8a96b0bd6388eef222

2
third_party/tools vendored

@ -1 +1 @@
Subproject commit 43a09bd136f0d28c61cd03103b9d151af1317381
Subproject commit 725d70ebaba30c20124075cf5e4bd751d2404d28