From 88888e40919107a6c527715777dbe2e1c4dba4de Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 25 Jul 2016 05:47:57 +0000 Subject: [PATCH] bye bye, boost! thanks @apathy! --- CMakeLists.txt | 1 - engine/server/library/serverGame/src/CMakeLists.txt | 1 - engine/server/library/serverNetworkMessages/src/CMakeLists.txt | 1 - engine/server/library/serverPathfinding/src/CMakeLists.txt | 1 - engine/server/library/serverScript/src/CMakeLists.txt | 1 - engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt | 1 - engine/shared/library/sharedUtility/src/CMakeLists.txt | 1 - .../shared/library/sharedUtility/src/shared/UniqueNameList.h | 2 +- game/server/application/SwgGameServer/src/CMakeLists.txt | 3 +-- 9 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a0aa14..1137f22e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ include_directories(/usr/include/i386-linux-gnu) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) find_package(BISON REQUIRED) -find_package(Boost REQUIRED) find_package(FLEX REQUIRED) find_package(JNI REQUIRED) find_package(LibXml2 REQUIRED) diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt index c4a092e5..3fde09a0 100644 --- a/engine/server/library/serverGame/src/CMakeLists.txt +++ b/engine/server/library/serverGame/src/CMakeLists.txt @@ -752,7 +752,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/projects - ${Boost_INCLUDE_DIR} ${JNI_INCLUDE_DIRS} ${PCRE_INCLUDE_DIR} ) diff --git a/engine/server/library/serverNetworkMessages/src/CMakeLists.txt b/engine/server/library/serverNetworkMessages/src/CMakeLists.txt index 2e9ded82..edb6e914 100644 --- a/engine/server/library/serverNetworkMessages/src/CMakeLists.txt +++ b/engine/server/library/serverNetworkMessages/src/CMakeLists.txt @@ -509,7 +509,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ) add_library(serverNetworkMessages STATIC diff --git a/engine/server/library/serverPathfinding/src/CMakeLists.txt b/engine/server/library/serverPathfinding/src/CMakeLists.txt index f1127c72..14e03fbb 100644 --- a/engine/server/library/serverPathfinding/src/CMakeLists.txt +++ b/engine/server/library/serverPathfinding/src/CMakeLists.txt @@ -62,7 +62,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localizationArchive/include/public ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ) add_library(serverPathfinding STATIC diff --git a/engine/server/library/serverScript/src/CMakeLists.txt b/engine/server/library/serverScript/src/CMakeLists.txt index 12730bfa..7190ea0e 100644 --- a/engine/server/library/serverScript/src/CMakeLists.txt +++ b/engine/server/library/serverScript/src/CMakeLists.txt @@ -138,7 +138,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ${JNI_INCLUDE_DIRS} ) diff --git a/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt index 977aea23..eed44696 100644 --- a/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt +++ b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt @@ -724,7 +724,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ) add_library(sharedNetworkMessages STATIC diff --git a/engine/shared/library/sharedUtility/src/CMakeLists.txt b/engine/shared/library/sharedUtility/src/CMakeLists.txt index d4da46d1..85fbddb3 100644 --- a/engine/shared/library/sharedUtility/src/CMakeLists.txt +++ b/engine/shared/library/sharedUtility/src/CMakeLists.txt @@ -124,7 +124,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ) add_library(sharedUtility STATIC diff --git a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h index 37958778..dfe33b2f 100755 --- a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h +++ b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h @@ -28,7 +28,7 @@ namespace std * (1) unique name to a stable integer index, and (2) integer index * mapped back to unique name. Names are lower case, case insensitive. * - * This class makes use of boost::shared_ptr to minimize the number of + * This class makes use of shared_ptr to minimize the number of * memory allocations associated with using a CrcLowerString. It also * makes use of sorted vectors for storage. */ diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt index 1bc63e22..85758e34 100644 --- a/game/server/application/SwgGameServer/src/CMakeLists.txt +++ b/game/server/application/SwgGameServer/src/CMakeLists.txt @@ -91,14 +91,13 @@ include_directories( ${SWG_GAME_SOURCE_DIR}/shared/library/swgSharedNetworkMessages/include/public ${SWG_GAME_SOURCE_DIR}/shared/library/swgSharedUtility/include/public ${SWG_GAME_SOURCE_DIR}/server/library/swgServerNetworkMessages/include/public - ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include + ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/fileInterface/include/public ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localizationArchive/include/public ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public - ${Boost_INCLUDE_DIR} ${JNI_INCLUDE_DIRS} )