diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 58a2a29..a69318b 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -25,6 +25,7 @@ include_directories( link_directories( /usr/lib64/mysql /usr/local/lib + ../../third_party/behaviac/lib ) aux_source_directory(../../third_party/a8engine/a8 @@ -39,6 +40,7 @@ aux_source_directory(../../third_party/recastnavigation/Detour/Source SRC_LIST ) + execute_process( COMMAND touch -a cs_proto.pb.h COMMAND touch -a cs_proto.pb.cc @@ -84,4 +86,5 @@ target_link_libraries( curl hiredis tinyxml2 + behaviac_gcc_release ) diff --git a/third_party/a8engine b/third_party/a8engine index ee4ceec..01adda7 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit ee4ceec3d96375f9ca6ba4816ade7508bd570a92 +Subproject commit 01adda7e31f990dcb69ab54e1529bbdcd153d8de diff --git a/third_party/behaviac b/third_party/behaviac index fb32ab5..12b84cc 160000 --- a/third_party/behaviac +++ b/third_party/behaviac @@ -1 +1 @@ -Subproject commit fb32ab557952bc66abd459452a11f12db425a793 +Subproject commit 12b84ccd07a83502f0dff0e9689f7fd931256878 diff --git a/third_party/framework b/third_party/framework index f7c0890..3d62b9c 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit f7c0890bc84974c2770688378696bd8d74cfa7c2 +Subproject commit 3d62b9c0c3d17c3036179073f0a4c0310b5a274a