From ad63b1514412315b5761f7c4a4830d3b724e6588 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sat, 5 Jun 2021 22:37:56 +0800
Subject: [PATCH] ubuntu compile ok

---
 server/gameserver/CMakeLists.txt   | 3 +++
 server/gameserver/building.cc      | 2 ++
 server/gameserver/car.cc           | 2 ++
 server/gameserver/human.cc         | 1 +
 server/gameserver/jsondatamgr.cc   | 8 ++------
 server/gameserver/metamgr.cc       | 8 ++------
 server/gameserver/player.cc        | 1 +
 server/gameserver/zombiemode.ai.cc | 1 +
 third_party/a8engine               | 2 +-
 9 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt
index 5c2c2d5..e9f0966 100644
--- a/server/gameserver/CMakeLists.txt
+++ b/server/gameserver/CMakeLists.txt
@@ -42,6 +42,9 @@ aux_source_directory(../../third_party/a8engine/a8
 aux_source_directory(../../third_party/framework/cpp
   SRC_LIST
 )
+list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_msgid.pb.cc")
+list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/im_proto.pb.cc")
+list(REMOVE_ITEM SRC_LIST "../../third_party/framework/cpp/btmgr.cc")
 
 aux_source_directory(../../third_party/recastnavigation/Recast/Source
   SRC_LIST
diff --git a/server/gameserver/building.cc b/server/gameserver/building.cc
index e03b9c4..e13d0e9 100644
--- a/server/gameserver/building.cc
+++ b/server/gameserver/building.cc
@@ -1,5 +1,7 @@
 #include "precompile.h"
 
+#include <math.h>
+
 #include "building.h"
 #include "collider.h"
 #include "metamgr.h"
diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc
index 5cdb00d..960c053 100644
--- a/server/gameserver/car.cc
+++ b/server/gameserver/car.cc
@@ -1,5 +1,7 @@
 #include "precompile.h"
 
+#include <math.h>
+
 #include "car.h"
 #include "collider.h"
 #include "human.h"
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 5330372..16471e8 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1,5 +1,6 @@
 #include "precompile.h"
 
+#include <math.h>
 #include <float.h>
 
 #include <a8/mutable_xobject.h>
diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc
index 3b9154d..17f605e 100644
--- a/server/gameserver/jsondatamgr.cc
+++ b/server/gameserver/jsondatamgr.cc
@@ -9,17 +9,13 @@ void JsonDataMgr::Init()
 {
     if (!f8::IsOnlineEnv()) {
         if (f8::IsTestEnv()) {
-            work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.test",
+            work_path_ = a8::Format("../../../conf_test/game%d/gameserver.test",
                                     {
-                                     GAME_ID,
-                                     App::Instance()->instance_id,
                                      GAME_ID
                                     });
         } else {
-            work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.dev",
+            work_path_ = a8::Format("../../../conf_test/game%d/gameserver.dev",
                                     {
-                                     GAME_ID,
-                                     App::Instance()->instance_id,
                                      GAME_ID
                                     });
         }
diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 2828fe9..fd41e33 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -102,18 +102,14 @@ public:
     {
         if (!f8::IsOnlineEnv()) {
             if (f8::IsTestEnv()) {
-                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.test/res%d/",
+                res_path = a8::Format("../../../conf_test/game%d/gameserver.test/res%d/",
                                       {
-                                       GAME_ID,
-                                       App::Instance()->instance_id,
                                        GAME_ID,
                                        App::Instance()->instance_id
                                       });
             } else {
-                res_path = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.dev/res%d/",
+                res_path = a8::Format("../../../conf_test/game%d/gameserver.dev/res%d/",
                                       {
-                                       GAME_ID,
-                                       App::Instance()->instance_id,
                                        GAME_ID,
                                        App::Instance()->instance_id
                                       });
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 569a8a9..3a57cb5 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1,5 +1,6 @@
 #include "precompile.h"
 
+#include <math.h>
 #include <float.h>
 
 #include "playermgr.h"
diff --git a/server/gameserver/zombiemode.ai.cc b/server/gameserver/zombiemode.ai.cc
index 3767d67..0cbfa69 100644
--- a/server/gameserver/zombiemode.ai.cc
+++ b/server/gameserver/zombiemode.ai.cc
@@ -1,5 +1,6 @@
 #include "precompile.h"
 
+#include <math.h>
 #include <float.h>
 
 #include "zombiemode.ai.h"
diff --git a/third_party/a8engine b/third_party/a8engine
index 41cb09f..f0ee3fb 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 41cb09fe83abc21db2e912117d11feceb4b00a55
+Subproject commit f0ee3fb68faa185ff78f4c59c9a1edeb91b70031