diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index f0e2247..b231a3d 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -1,17 +1,12 @@ project(gameserver) cmake_minimum_required(VERSION 2.8) -if (${GAME_ID}) - message(GAME_ID: ${GAME_ID}) -else() - set(GAME_ID 2001) - message(GAME_ID: ${GAME_ID}) -endif() +set(GAME_ID 2001) set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Release") -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID}") +set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID}") include_directories( AFTER diff --git a/third_party/a8engine b/third_party/a8engine index bb10963..d0c0321 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit bb10963a71fbd0d6dd145dc7fd333b09ab708300 +Subproject commit d0c032181b8735fb55cd9900c00776bd4a253c6e