server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ubuntu compile ok

Browse Source
This commit is contained in:
azw 2021-06-05 22:37:56 +08:00
parent c3b832b41f
commit ad63b15144
9 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/CMakeLists.txt
View File

@ -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

2
server/gameserver/building.cc
View File

@ -1,5 +1,7 @@
#include "precompile.h"
#include <math.h>
#include "building.h"
#include "collider.h"
#include "metamgr.h"

2
server/gameserver/car.cc
View File

@ -1,5 +1,7 @@
#include "precompile.h"
#include <math.h>
#include "car.h"
#include "collider.h"
#include "human.h"

1
server/gameserver/human.cc
View File

@ -1,5 +1,6 @@
#include "precompile.h"
#include <math.h>
#include <float.h>
#include <a8/mutable_xobject.h>

8
server/gameserver/jsondatamgr.cc
View File

@ -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
});
}

8
server/gameserver/metamgr.cc
View File

@ -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
});

1
server/gameserver/player.cc
View File

@ -1,5 +1,6 @@
#include "precompile.h"
#include <math.h>
#include <float.h>
#include "playermgr.h"

1
server/gameserver/zombiemode.ai.cc
View File

@ -1,5 +1,6 @@
#include "precompile.h"
#include <math.h>
#include <float.h>
#include "zombiemode.ai.h"

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 41cb09fe83abc21db2e912117d11feceb4b00a55
Subproject commit f0ee3fb68faa185ff78f4c59c9a1edeb91b70031