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

1

Browse Source
This commit is contained in:
aozhiwei 2020-06-16 19:32:44 +08:00
parent 03c077fca7
commit fb7d3d868f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/masterserver/CMakeLists.txt
View File

@ -1,6 +1,8 @@
project(friend_masterserver) project(friend_masterserver)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(GAME_ID 9003)
if (${RELEASE}) if (${RELEASE})
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
message("release mode") message("release mode")
@ -8,8 +10,8 @@ else()
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
message("debug mode") message("debug mode")
endif() endif()
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++11 -DNDEBUG -DGAME_ID=${GAME_ID} ")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DDEBUG -DGAME_ID=${GAME_ID} ")
include_directories( include_directories(
AFTER AFTER

6
server/masterserver/jsondatamgr.cc
View File

@ -10,13 +10,15 @@ void JsonDataMgr::Init()
std::string masterserver_cluster_json_file; std::string masterserver_cluster_json_file;
if (!f8::IsOnlineEnv()) { if (!f8::IsOnlineEnv()) {
if (f8::IsTestEnv()) { if (f8::IsTestEnv()) {
work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/masterserver.test", work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/masterserver.test",
{ {
GAME_ID,
App::Instance()->instance_id, App::Instance()->instance_id,
}); });
} else { } else {
work_path_ = a8::Format("/root/pub/friend/%d/conf_test/friend/masterserver.dev", work_path_ = a8::Format("/root/pub/%d/%d/conf_test/friend/masterserver.dev",
{ {
GAME_ID,
App::Instance()->instance_id, App::Instance()->instance_id,
}); });
} }