From 120d62d35c0b674f681f492f0b87accde6d909f4 Mon Sep 17 00:00:00 2001 From: azw Date: Sun, 19 Feb 2023 02:04:40 +0000 Subject: [PATCH] 1 --- .gitmodules | 9 +++++++++ server/imserver/CMakeLists.txt | 10 +++++----- third_party/behaviac | 1 + third_party/recastnavigation | 1 + third_party/tools | 1 + 5 files changed, 17 insertions(+), 5 deletions(-) create mode 160000 third_party/behaviac create mode 160000 third_party/recastnavigation create mode 160000 third_party/tools diff --git a/.gitmodules b/.gitmodules index a3e2bba..f3bfb1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,12 @@ [submodule "third_party/f8"] path = third_party/f8 url = git@git.kingsome.cn:server_common/f8.git +[submodule "third_party/behaviac"] + path = third_party/behaviac + url = git@git.kingsome.cn:libs/behaviac.git +[submodule "third_party/recastnavigation"] + path = third_party/recastnavigation + url = git@git.kingsome.cn:libs/recastnavigation.git +[submodule "third_party/tools"] + path = third_party/tools + url = git@git.kingsome.cn:server_common/tools.git diff --git a/server/imserver/CMakeLists.txt b/server/imserver/CMakeLists.txt index 0cfd074..a14fbfc 100644 --- a/server/imserver/CMakeLists.txt +++ b/server/imserver/CMakeLists.txt @@ -99,11 +99,11 @@ add_executable( imserver${GAME_ID} ${SRC_LIST} ) -add_custom_target(script_pb_protocol ALL) -add_custom_command(TARGET script_pb_protocol - PRE_BUILD - COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=cs_proto,cs_msgid,ss_proto,ss_msgid) -add_dependencies(imserver${GAME_ID} script_pb_protocol) +# add_custom_target(script_pb_protocol ALL) +# add_custom_command(TARGET script_pb_protocol +# PRE_BUILD +# COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=cs_proto,cs_msgid,ss_proto,ss_msgid) +# add_dependencies(imserver${GAME_ID} script_pb_protocol) target_link_libraries( imserver${GAME_ID} diff --git a/third_party/behaviac b/third_party/behaviac new file mode 160000 index 0000000..98824e3 --- /dev/null +++ b/third_party/behaviac @@ -0,0 +1 @@ +Subproject commit 98824e365b8dce62ad37f3a32edf1c6bb803c8ac diff --git a/third_party/recastnavigation b/third_party/recastnavigation new file mode 160000 index 0000000..0165dc2 --- /dev/null +++ b/third_party/recastnavigation @@ -0,0 +1 @@ +Subproject commit 0165dc279d62af5536f122ea30c3cd3f642f34ee diff --git a/third_party/tools b/third_party/tools new file mode 160000 index 0000000..76a35f5 --- /dev/null +++ b/third_party/tools @@ -0,0 +1 @@ +Subproject commit 76a35f553d231ba67e9ecc98615bdfde54e02cdc