diff --git a/server/tools/scripts/construct/build_pb.py b/server/tools/scripts/construct/build_pb.py index dbb591e..2561160 100644 --- a/server/tools/scripts/construct/build_pb.py +++ b/server/tools/scripts/construct/build_pb.py @@ -62,9 +62,6 @@ def rebuild(): except Exception as e: print('build_protocol rebuild error:' + str(e)) -def repair_githooks(): - os.system('/bin/bash ../tools/scripts/githooks/install.sh') - parser = OptionParser(usage="%prog [options]") parser.add_option( "-n", @@ -73,8 +70,6 @@ parser.add_option( help = "no repair git hooks", ) (options, args) = parser.parse_args() -if not options.nohooks: - repair_githooks() if need_rebuild(): rebuild() diff --git a/server/wsproxy/CMakeLists.txt b/server/wsproxy/CMakeLists.txt index b5db917..db4b099 100644 --- a/server/wsproxy/CMakeLists.txt +++ b/server/wsproxy/CMakeLists.txt @@ -26,6 +26,8 @@ include_directories( /usr/include/mysql /usr/include/jsoncpp /usr/include/hiredis + /usr/include/eigen3 + /usr/include/glm ../../third_party . ) diff --git a/third_party/a8engine b/third_party/a8engine index 287a824..238bb85 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 287a824201d2aac638b5a8b2b0c01e87973dc685 +Subproject commit 238bb8599fe25133416448739a8b298978879aba