diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 7b4efc6c..f15a2188 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -66,6 +66,14 @@ aux_source_directory(behaviac_generated/types/internal SRC_LIST ) +aux_source_directory(mtb + SRC_LIST +) + +aux_source_directory(mt + SRC_LIST +) + execute_process( COMMAND touch -a cs_proto.pb.h COMMAND touch -a cs_proto.pb.cc diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index d663ead8..b1d5b88f 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -42,6 +42,7 @@ #include "skillhelper.h" #include "config.h" +#include "mt/Param.h" struct MsgNode { @@ -118,8 +119,18 @@ static void SavePerfLog() f8::HttpClientPool::Instance()->max_user_request_delay = 0; } +template +void SafeCallStaticInit1(...) { }; + +template +void SafeCallStaticInit1(int) { T::StaticInit1(); }; + bool App::Init(int argc, char* argv[]) { + { + SafeCallStaticInit1(0); + + } #if 0 { std::string data = "${master.name} [aa ]${image.id:1000} bb${}cc"; diff --git a/third_party/a8 b/third_party/a8 index 966f7119..d3303639 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 966f7119e7545325458451537830731b89d0a48b +Subproject commit d33036398d06f3f81cda9b17b8fc2d7a6c67e95b diff --git a/third_party/f8 b/third_party/f8 index 801ee99e..458a24b4 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit 801ee99ec3c1649eea8722dac4322012846eae30 +Subproject commit 458a24b4c672c87c3a961a3d0610dd7f2d783d5c