From 697893f7d61dd122601425518b58898b4f972476 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 21 Jan 2014 08:25:15 -0700 Subject: [PATCH] Removed unneeded cmake code --- engine/server/application/CMakeLists.txt | 2 + .../CentralServer/src/CMakeLists.txt | 11 +--- .../application/ChatServer/src/CMakeLists.txt | 57 ++++++++----------- .../CommoditiesServer/src/CMakeLists.txt | 3 - .../ConnectionServer/src/CMakeLists.txt | 11 +--- .../application/LogServer/src/CMakeLists.txt | 11 ---- .../application/LoginPing/src/CMakeLists.txt | 18 ------ .../LoginServer/src/CMakeLists.txt | 13 ----- .../MetricsServer/src/CMakeLists.txt | 15 +---- .../PlanetServer/src/CMakeLists.txt | 15 +---- .../ServerConsole/src/CMakeLists.txt | 29 +++------- .../src/CMakeLists.txt | 3 - .../TaskManager/src/CMakeLists.txt | 15 +---- .../TransferServer/src/CMakeLists.txt | 20 ++----- .../library/serverDatabase/CMakeLists.txt | 4 -- .../server/library/serverGame/CMakeLists.txt | 4 -- .../library/serverKeyShare/CMakeLists.txt | 4 -- .../library/serverMetrics/CMakeLists.txt | 4 -- .../serverNetworkMessages/CMakeLists.txt | 4 -- .../library/serverPathfinding/CMakeLists.txt | 4 -- .../library/serverScript/CMakeLists.txt | 4 -- .../library/serverUtility/CMakeLists.txt | 4 -- .../library/sharedCollision/CMakeLists.txt | 4 -- .../sharedCommandParser/CMakeLists.txt | 4 -- .../library/sharedCompression/CMakeLists.txt | 4 -- .../sharedDatabaseInterface/CMakeLists.txt | 4 -- .../shared/library/sharedDebug/CMakeLists.txt | 4 -- .../shared/library/sharedFile/CMakeLists.txt | 4 -- .../library/sharedFoundation/CMakeLists.txt | 4 -- .../sharedFoundationTypes/CMakeLists.txt | 4 -- .../library/sharedFractal/CMakeLists.txt | 4 -- .../shared/library/sharedGame/CMakeLists.txt | 4 -- .../shared/library/sharedImage/CMakeLists.txt | 4 -- .../shared/library/sharedIoWin/CMakeLists.txt | 4 -- .../shared/library/sharedLog/CMakeLists.txt | 4 -- .../shared/library/sharedMath/CMakeLists.txt | 4 -- .../library/sharedMathArchive/CMakeLists.txt | 4 -- .../sharedMemoryManager/CMakeLists.txt | 4 -- .../sharedMessageDispatch/CMakeLists.txt | 4 -- .../library/sharedNetwork/CMakeLists.txt | 4 -- .../sharedNetworkMessages/CMakeLists.txt | 4 -- .../library/sharedObject/CMakeLists.txt | 4 -- .../library/sharedPathfinding/CMakeLists.txt | 4 -- .../library/sharedRandom/CMakeLists.txt | 4 -- .../shared/library/sharedRegex/CMakeLists.txt | 4 -- .../library/sharedRegex/src/CMakeLists.txt | 4 ++ .../sharedRemoteDebugServer/CMakeLists.txt | 4 -- .../library/sharedSkillSystem/CMakeLists.txt | 4 -- .../sharedSynchronization/CMakeLists.txt | 4 -- .../library/sharedTerrain/CMakeLists.txt | 4 -- .../library/sharedThread/CMakeLists.txt | 4 -- .../library/sharedThread/src/CMakeLists.txt | 1 + .../library/sharedUtility/CMakeLists.txt | 4 -- .../shared/library/sharedXml/CMakeLists.txt | 4 -- .../library/sharedXml/src/CMakeLists.txt | 4 ++ .../SwgDatabaseServer/CMakeLists.txt | 4 -- .../SwgDatabaseServer/src/CMakeLists.txt | 16 +----- .../application/SwgGameServer/CMakeLists.txt | 4 -- .../SwgGameServer/src/CMakeLists.txt | 18 +----- .../swgServerNetworkMessages/CMakeLists.txt | 4 -- .../src/CMakeLists.txt | 2 - .../swgSharedNetworkMessages/CMakeLists.txt | 4 -- .../src/CMakeLists.txt | 2 - .../library/swgSharedUtility/CMakeLists.txt | 4 -- .../swgSharedUtility/src/CMakeLists.txt | 2 - 65 files changed, 57 insertions(+), 387 deletions(-) diff --git a/engine/server/application/CMakeLists.txt b/engine/server/application/CMakeLists.txt index bd0461c8..8d97f791 100644 --- a/engine/server/application/CMakeLists.txt +++ b/engine/server/application/CMakeLists.txt @@ -1,4 +1,6 @@ +link_directories(${STLPORT_LIBDIR}) + add_subdirectory(CentralServer) add_subdirectory(ChatServer) add_subdirectory(CommoditiesServer) diff --git a/engine/server/application/CentralServer/src/CMakeLists.txt b/engine/server/application/CentralServer/src/CMakeLists.txt index d437c464..fa0fc6f2 100644 --- a/engine/server/application/CentralServer/src/CMakeLists.txt +++ b/engine/server/application/CentralServer/src/CMakeLists.txt @@ -104,7 +104,7 @@ if(WIN32) shared/AuctionTransferGameAPI/Base/win32/Types.h ) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp shared/AuctionTransferGameAPI/Base/linux/Archive.h shared/AuctionTransferGameAPI/Base/linux/Mutex.cpp @@ -156,8 +156,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(CentralServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -192,13 +190,6 @@ target_link_libraries(CentralServer localizationArchive unicode unicodeArchive - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(CentralServer mswsock ws2_32) -endif() diff --git a/engine/server/application/ChatServer/src/CMakeLists.txt b/engine/server/application/ChatServer/src/CMakeLists.txt index b77e69a9..cfe6e0cc 100644 --- a/engine/server/application/ChatServer/src/CMakeLists.txt +++ b/engine/server/application/ChatServer/src/CMakeLists.txt @@ -1,30 +1,30 @@ set(SHARED_SOURCES - shared/CentralServerConnection.cpp - shared/CentralServerConnection.h - shared/ChatInterface.cpp - shared/ChatInterface.h - shared/ChatServerAvatarOwner.cpp - shared/ChatServerAvatarOwner.h - shared/ChatServer.cpp - shared/ChatServer.h - shared/ChatServerRoomOwner.cpp - shared/ChatServerRoomOwner.h + shared/CentralServerConnection.cpp + shared/CentralServerConnection.h + shared/ChatInterface.cpp + shared/ChatInterface.h + shared/ChatServerAvatarOwner.cpp + shared/ChatServerAvatarOwner.h + shared/ChatServer.cpp + shared/ChatServer.h + shared/ChatServerRoomOwner.cpp + shared/ChatServerRoomOwner.h shared/ConfigChatServer.cpp - shared/ConfigChatServer.h - shared/ConnectionServerConnection.cpp - shared/ConnectionServerConnection.h + shared/ConfigChatServer.h + shared/ConnectionServerConnection.cpp + shared/ConnectionServerConnection.h shared/CustomerServiceServerConnection.cpp - shared/CustomerServiceServerConnection.h - shared/FirstChatServer.cpp - shared/FirstChatServer.h - shared/GameServerConnection.cpp - shared/GameServerConnection.h - shared/PlanetServerConnection.h - shared/PlanetServerServerConnection.cpp - shared/ChatServerMetricsData.cpp + shared/CustomerServiceServerConnection.h + shared/FirstChatServer.cpp + shared/FirstChatServer.h + shared/GameServerConnection.cpp + shared/GameServerConnection.h + shared/PlanetServerConnection.h + shared/PlanetServerServerConnection.cpp + shared/ChatServerMetricsData.cpp shared/ChatServerMetricsData.h - shared/VChatInterface.h + shared/VChatInterface.h shared/VChatInterface.cpp ) @@ -33,12 +33,12 @@ if(WIN32) win32/WinMain.cpp ) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp ) endif() -add_definitions(-DEXTERNAL_DISTRO -DNAMESPACE=ChatSystem -D_REENTRANT -DAPI_NAMESPACE=VChatSystem) +add_definitions(-DEXTERNAL_DISTRO -DNAMESPACE=ChatSystem -DAPI_NAMESPACE=VChatSystem) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/shared @@ -71,8 +71,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/soePlatform/VChatAPI/utils2.0/utils ) -link_directories(${STLPORT_LIBDIR}) - add_executable(ChatServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -102,15 +100,8 @@ target_link_libraries(ChatServer localizationArchive unicode unicodeArchive - udplibrary ChatMono VChatAPI ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(ChatServer mswsock ws2_32) -endif() diff --git a/engine/server/application/CommoditiesServer/src/CMakeLists.txt b/engine/server/application/CommoditiesServer/src/CMakeLists.txt index 01ef9652..e446e11c 100644 --- a/engine/server/application/CommoditiesServer/src/CMakeLists.txt +++ b/engine/server/application/CommoditiesServer/src/CMakeLists.txt @@ -62,8 +62,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public ) -link_directories(${STLPORT_LIBDIR}) - add_executable(CommoditiesServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -88,6 +86,5 @@ target_link_libraries(CommoditiesServer serverNetworkMessages serverUtility ${STLPORT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/ConnectionServer/src/CMakeLists.txt b/engine/server/application/ConnectionServer/src/CMakeLists.txt index 15daeec6..e6f93b51 100644 --- a/engine/server/application/ConnectionServer/src/CMakeLists.txt +++ b/engine/server/application/ConnectionServer/src/CMakeLists.txt @@ -21,7 +21,7 @@ set(SHARED_SOURCES shared/GameConnection.h shared/SessionApiClient.cpp shared/SessionApiClient.h - shared/PseudoClientConnection.cpp + shared/PseudoClientConnection.cpp shared/PseudoClientConnection.h ) @@ -69,8 +69,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(ConnectionServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -106,13 +104,6 @@ target_link_libraries(ConnectionServer Base CommonAPI LoginAPI - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(ConnectionServer mswsock ws2_32) -endif() diff --git a/engine/server/application/LogServer/src/CMakeLists.txt b/engine/server/application/LogServer/src/CMakeLists.txt index 4f1e44fe..5431ccbb 100644 --- a/engine/server/application/LogServer/src/CMakeLists.txt +++ b/engine/server/application/LogServer/src/CMakeLists.txt @@ -40,18 +40,14 @@ include_directories( ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetwork/include/public ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedThread/include/public -# ${SWG_ENGINE_SOURCE_DIR}/server/library/serverNetworkMessages/include/public ${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/include/public ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include -# ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/fileInterface/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 ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(LogServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -80,13 +76,6 @@ target_link_libraries(LogServer localizationArchive unicode unicodeArchive - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(LogServer mswsock ws2_32) -endif() diff --git a/engine/server/application/LoginPing/src/CMakeLists.txt b/engine/server/application/LoginPing/src/CMakeLists.txt index 676ee679..c3dc5709 100644 --- a/engine/server/application/LoginPing/src/CMakeLists.txt +++ b/engine/server/application/LoginPing/src/CMakeLists.txt @@ -37,8 +37,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include ) -link_directories(${STLPORT_LIBDIR}) - add_executable(LoginPing ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -49,8 +47,6 @@ target_link_libraries(LoginPing sharedDebug sharedFile sharedFoundation - #sharedLog - #sharedMath sharedMemoryManager sharedMessageDispatch sharedNetwork @@ -58,22 +54,8 @@ target_link_libraries(LoginPing sharedRandom sharedSynchronization sharedThread - #sharedUtility serverNetworkMessages - #serverUtility archive - #fileInterface - #localization - #localizationArchive - #unicode - #unicodeArchive - #udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(LoginPing mswsock ws2_32) -endif() diff --git a/engine/server/application/LoginServer/src/CMakeLists.txt b/engine/server/application/LoginServer/src/CMakeLists.txt index 3239fe14..398d8da8 100644 --- a/engine/server/application/LoginServer/src/CMakeLists.txt +++ b/engine/server/application/LoginServer/src/CMakeLists.txt @@ -72,14 +72,10 @@ if(WIN32) win32/FirstLoginServer.cpp win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() set(PLATFORM_SOURCES linux/main.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -116,8 +112,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(LoginServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -156,13 +150,6 @@ target_link_libraries(LoginServer CommonAPI LoginAPI MonAPI2 - udplibrary ${STLPORT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - set_target_properties (LoginServer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:\"libcmt\"") - target_link_libraries(LoginServer mswsock ws2_32) -endif() diff --git a/engine/server/application/MetricsServer/src/CMakeLists.txt b/engine/server/application/MetricsServer/src/CMakeLists.txt index 2bb3eb50..5a068dfd 100644 --- a/engine/server/application/MetricsServer/src/CMakeLists.txt +++ b/engine/server/application/MetricsServer/src/CMakeLists.txt @@ -16,14 +16,10 @@ if(WIN32) set(PLATFORM_SOURCES win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -46,8 +42,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(MetricsServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -76,14 +70,7 @@ target_link_libraries(MetricsServer localizationArchive unicode unicodeArchive - udplibrary MonAPI2 ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(MetricsServer mswsock ws2_32) -endif() diff --git a/engine/server/application/PlanetServer/src/CMakeLists.txt b/engine/server/application/PlanetServer/src/CMakeLists.txt index 89b2ab1e..b82d9021 100644 --- a/engine/server/application/PlanetServer/src/CMakeLists.txt +++ b/engine/server/application/PlanetServer/src/CMakeLists.txt @@ -36,14 +36,10 @@ if(WIN32) win32/FirstPlanetServer.cpp win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -76,8 +72,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary ) -link_directories(${STLPORT_LIBDIR}) - add_executable(PlanetServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -108,13 +102,6 @@ target_link_libraries(PlanetServer localizationArchive unicode unicodeArchive - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(PlanetServer mswsock ws2_32) -endif() diff --git a/engine/server/application/ServerConsole/src/CMakeLists.txt b/engine/server/application/ServerConsole/src/CMakeLists.txt index b114e829..594b790f 100644 --- a/engine/server/application/ServerConsole/src/CMakeLists.txt +++ b/engine/server/application/ServerConsole/src/CMakeLists.txt @@ -11,21 +11,17 @@ set(SHARED_SOURCES ) if(WIN32) - set(PLATFORM_SOURCES - win32/main.cpp - ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) + set(PLATFORM_SOURCES + win32/main.cpp + ) else() - set(PLATFORM_SOURCES - linux/main.cpp - ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) + set(PLATFORM_SOURCES + linux/main.cpp + ) endif() include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/shared + ${CMAKE_CURRENT_SOURCE_DIR}/shared ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCompression/include/public ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public ${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public @@ -39,11 +35,9 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include ) -link_directories(${STLPORT_LIBDIR}) - add_executable(ServerConsole - ${SHARED_SOURCES} - ${PLATFORM_SOURCES} + ${SHARED_SOURCES} + ${PLATFORM_SOURCES} ) target_link_libraries(ServerConsole @@ -57,10 +51,5 @@ target_link_libraries(ServerConsole sharedNetworkMessages sharedThread ${STLPORT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(ServerConsole mswsock ws2_32) -endif() diff --git a/engine/server/application/StationPlayersCollector/src/CMakeLists.txt b/engine/server/application/StationPlayersCollector/src/CMakeLists.txt index edd946b7..63a77cd8 100644 --- a/engine/server/application/StationPlayersCollector/src/CMakeLists.txt +++ b/engine/server/application/StationPlayersCollector/src/CMakeLists.txt @@ -45,8 +45,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include ) -link_directories(${STLPORT_LIBDIR}) - add_executable(StationPlayersCollector ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -72,6 +70,5 @@ target_link_libraries(StationPlayersCollector archive unicode ${STLPORT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/TaskManager/src/CMakeLists.txt b/engine/server/application/TaskManager/src/CMakeLists.txt index bae3cd30..1db7a259 100644 --- a/engine/server/application/TaskManager/src/CMakeLists.txt +++ b/engine/server/application/TaskManager/src/CMakeLists.txt @@ -43,18 +43,14 @@ if(WIN32) win32/TaskManagerSysInfo.cpp win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/ConsoleInput.cpp linux/EnvironmentVariable.cpp linux/main.cpp linux/ProcessSpawner.cpp linux/TaskManagerSysInfo.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -78,8 +74,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include ) -link_directories(${STLPORT_LIBDIR}) - add_executable(TaskManager ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -108,13 +102,6 @@ target_link_libraries(TaskManager localizationArchive unicode unicodeArchive - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - target_link_libraries(TaskManager mswsock ws2_32) -endif() diff --git a/engine/server/application/TransferServer/src/CMakeLists.txt b/engine/server/application/TransferServer/src/CMakeLists.txt index 941f68d3..5626bc22 100644 --- a/engine/server/application/TransferServer/src/CMakeLists.txt +++ b/engine/server/application/TransferServer/src/CMakeLists.txt @@ -4,11 +4,11 @@ set(SHARED_SOURCES shared/CentralServerConnection.h shared/ConfigTransferServer.cpp shared/ConfigTransferServer.h - shared/ConsoleCommandParser.cpp + shared/ConsoleCommandParser.cpp shared/ConsoleCommandParser.h - shared/ConsoleManager.cpp - shared/ConsoleManager.h - shared/CTSAPIClient.cpp + shared/ConsoleManager.cpp + shared/ConsoleManager.h + shared/CTSAPIClient.cpp shared/CTSAPIClient.h shared/FirstTransferServer.h shared/TransferServer.cpp @@ -48,8 +48,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/soePlatform/CTServiceGameAPI ) -link_directories(${STLPORT_LIBDIR}) - add_executable(TransferServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -79,13 +77,7 @@ target_link_libraries(TransferServer localizationArchive unicode unicodeArchive - udplibrary CTServiceGameAPI ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS}) - -if(WIN32) - target_link_libraries(TransferServer mswsock ws2_32) -endif() + ${CMAKE_DL_LIBS} +) diff --git a/engine/server/library/serverDatabase/CMakeLists.txt b/engine/server/library/serverDatabase/CMakeLists.txt index c18a8365..e32c364d 100644 --- a/engine/server/library/serverDatabase/CMakeLists.txt +++ b/engine/server/library/serverDatabase/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverDatabase) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverGame/CMakeLists.txt b/engine/server/library/serverGame/CMakeLists.txt index 2a0c26b1..c8721623 100644 --- a/engine/server/library/serverGame/CMakeLists.txt +++ b/engine/server/library/serverGame/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverGame) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverKeyShare/CMakeLists.txt b/engine/server/library/serverKeyShare/CMakeLists.txt index d86cef83..aba47560 100644 --- a/engine/server/library/serverKeyShare/CMakeLists.txt +++ b/engine/server/library/serverKeyShare/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverKeyShare) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverMetrics/CMakeLists.txt b/engine/server/library/serverMetrics/CMakeLists.txt index 96a68840..9cca340c 100644 --- a/engine/server/library/serverMetrics/CMakeLists.txt +++ b/engine/server/library/serverMetrics/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverMetrics) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverNetworkMessages/CMakeLists.txt b/engine/server/library/serverNetworkMessages/CMakeLists.txt index abb2914b..26f82356 100644 --- a/engine/server/library/serverNetworkMessages/CMakeLists.txt +++ b/engine/server/library/serverNetworkMessages/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverNetworkMessages) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverPathfinding/CMakeLists.txt b/engine/server/library/serverPathfinding/CMakeLists.txt index 4b074b1c..0f89fef0 100644 --- a/engine/server/library/serverPathfinding/CMakeLists.txt +++ b/engine/server/library/serverPathfinding/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverPathfinding) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverScript/CMakeLists.txt b/engine/server/library/serverScript/CMakeLists.txt index 99648114..81bae60f 100644 --- a/engine/server/library/serverScript/CMakeLists.txt +++ b/engine/server/library/serverScript/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverScript) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/server/library/serverUtility/CMakeLists.txt b/engine/server/library/serverUtility/CMakeLists.txt index 458d6cf6..d6609ee5 100644 --- a/engine/server/library/serverUtility/CMakeLists.txt +++ b/engine/server/library/serverUtility/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(serverUtility) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedCollision/CMakeLists.txt b/engine/shared/library/sharedCollision/CMakeLists.txt index fea789e8..4aa782eb 100644 --- a/engine/shared/library/sharedCollision/CMakeLists.txt +++ b/engine/shared/library/sharedCollision/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedCollision) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedCommandParser/CMakeLists.txt b/engine/shared/library/sharedCommandParser/CMakeLists.txt index fc240e2f..ee781bf2 100644 --- a/engine/shared/library/sharedCommandParser/CMakeLists.txt +++ b/engine/shared/library/sharedCommandParser/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedCommandParser) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedCompression/CMakeLists.txt b/engine/shared/library/sharedCompression/CMakeLists.txt index 6a13e581..76f79eac 100644 --- a/engine/shared/library/sharedCompression/CMakeLists.txt +++ b/engine/shared/library/sharedCompression/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedCompression) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedDatabaseInterface/CMakeLists.txt b/engine/shared/library/sharedDatabaseInterface/CMakeLists.txt index 14fd2497..c9894570 100644 --- a/engine/shared/library/sharedDatabaseInterface/CMakeLists.txt +++ b/engine/shared/library/sharedDatabaseInterface/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedDatabaseInterface) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include/public ${CMAKE_CURRENT_SOURCE_DIR}/src_oci diff --git a/engine/shared/library/sharedDebug/CMakeLists.txt b/engine/shared/library/sharedDebug/CMakeLists.txt index 6f7a94cb..3d07ea97 100644 --- a/engine/shared/library/sharedDebug/CMakeLists.txt +++ b/engine/shared/library/sharedDebug/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedDebug) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedFile/CMakeLists.txt b/engine/shared/library/sharedFile/CMakeLists.txt index 544183b9..12549acd 100644 --- a/engine/shared/library/sharedFile/CMakeLists.txt +++ b/engine/shared/library/sharedFile/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedFile) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedFoundation/CMakeLists.txt b/engine/shared/library/sharedFoundation/CMakeLists.txt index 0ceac90f..369b4efc 100644 --- a/engine/shared/library/sharedFoundation/CMakeLists.txt +++ b/engine/shared/library/sharedFoundation/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedFoundation) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedFoundationTypes/CMakeLists.txt b/engine/shared/library/sharedFoundationTypes/CMakeLists.txt index 03e12574..8624637c 100644 --- a/engine/shared/library/sharedFoundationTypes/CMakeLists.txt +++ b/engine/shared/library/sharedFoundationTypes/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedFoundationTypes) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedFractal/CMakeLists.txt b/engine/shared/library/sharedFractal/CMakeLists.txt index 3c6adcee..d3230d33 100644 --- a/engine/shared/library/sharedFractal/CMakeLists.txt +++ b/engine/shared/library/sharedFractal/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedFractal) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedGame/CMakeLists.txt b/engine/shared/library/sharedGame/CMakeLists.txt index 46239e97..0747b31e 100644 --- a/engine/shared/library/sharedGame/CMakeLists.txt +++ b/engine/shared/library/sharedGame/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedGame) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedImage/CMakeLists.txt b/engine/shared/library/sharedImage/CMakeLists.txt index 6deead4a..98c50441 100644 --- a/engine/shared/library/sharedImage/CMakeLists.txt +++ b/engine/shared/library/sharedImage/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedImage) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedIoWin/CMakeLists.txt b/engine/shared/library/sharedIoWin/CMakeLists.txt index 3ff331fa..57631554 100644 --- a/engine/shared/library/sharedIoWin/CMakeLists.txt +++ b/engine/shared/library/sharedIoWin/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedIoWin) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedLog/CMakeLists.txt b/engine/shared/library/sharedLog/CMakeLists.txt index e717d300..c4d02034 100644 --- a/engine/shared/library/sharedLog/CMakeLists.txt +++ b/engine/shared/library/sharedLog/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedLog) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedMath/CMakeLists.txt b/engine/shared/library/sharedMath/CMakeLists.txt index 5b89b384..dca7161a 100644 --- a/engine/shared/library/sharedMath/CMakeLists.txt +++ b/engine/shared/library/sharedMath/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedMath) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedMathArchive/CMakeLists.txt b/engine/shared/library/sharedMathArchive/CMakeLists.txt index 9e1fc43c..de7e2cd3 100644 --- a/engine/shared/library/sharedMathArchive/CMakeLists.txt +++ b/engine/shared/library/sharedMathArchive/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedMathArchive) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedMemoryManager/CMakeLists.txt b/engine/shared/library/sharedMemoryManager/CMakeLists.txt index a9d2b237..3968ec03 100644 --- a/engine/shared/library/sharedMemoryManager/CMakeLists.txt +++ b/engine/shared/library/sharedMemoryManager/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedMemoryManager) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/private) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) diff --git a/engine/shared/library/sharedMessageDispatch/CMakeLists.txt b/engine/shared/library/sharedMessageDispatch/CMakeLists.txt index c3ee4994..41518868 100644 --- a/engine/shared/library/sharedMessageDispatch/CMakeLists.txt +++ b/engine/shared/library/sharedMessageDispatch/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedMessageDispatch) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedNetwork/CMakeLists.txt b/engine/shared/library/sharedNetwork/CMakeLists.txt index 2d050c0c..385b4173 100644 --- a/engine/shared/library/sharedNetwork/CMakeLists.txt +++ b/engine/shared/library/sharedNetwork/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedNetwork) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/private) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) diff --git a/engine/shared/library/sharedNetworkMessages/CMakeLists.txt b/engine/shared/library/sharedNetworkMessages/CMakeLists.txt index 782885a5..c41e3152 100644 --- a/engine/shared/library/sharedNetworkMessages/CMakeLists.txt +++ b/engine/shared/library/sharedNetworkMessages/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedNetworkMessages) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedObject/CMakeLists.txt b/engine/shared/library/sharedObject/CMakeLists.txt index da3456cd..c7fd3629 100644 --- a/engine/shared/library/sharedObject/CMakeLists.txt +++ b/engine/shared/library/sharedObject/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedObject) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/private) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) diff --git a/engine/shared/library/sharedPathfinding/CMakeLists.txt b/engine/shared/library/sharedPathfinding/CMakeLists.txt index 3a498561..366255ec 100644 --- a/engine/shared/library/sharedPathfinding/CMakeLists.txt +++ b/engine/shared/library/sharedPathfinding/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedPathfinding) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedRandom/CMakeLists.txt b/engine/shared/library/sharedRandom/CMakeLists.txt index fd91ce31..f216e39d 100644 --- a/engine/shared/library/sharedRandom/CMakeLists.txt +++ b/engine/shared/library/sharedRandom/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedRandom) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedRegex/CMakeLists.txt b/engine/shared/library/sharedRegex/CMakeLists.txt index ab238dd7..f67ed07a 100644 --- a/engine/shared/library/sharedRegex/CMakeLists.txt +++ b/engine/shared/library/sharedRegex/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedRegex) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedRegex/src/CMakeLists.txt b/engine/shared/library/sharedRegex/src/CMakeLists.txt index e7f924d1..96de2861 100644 --- a/engine/shared/library/sharedRegex/src/CMakeLists.txt +++ b/engine/shared/library/sharedRegex/src/CMakeLists.txt @@ -37,3 +37,7 @@ add_library(sharedRegex STATIC ${SHARED_SOURCES} ${PLATFORM_SOURCES} ) + +target_link_libraries(sharedRegex + ${PCRE_LIBRARY} +) diff --git a/engine/shared/library/sharedRemoteDebugServer/CMakeLists.txt b/engine/shared/library/sharedRemoteDebugServer/CMakeLists.txt index ea315e32..6a7e3854 100644 --- a/engine/shared/library/sharedRemoteDebugServer/CMakeLists.txt +++ b/engine/shared/library/sharedRemoteDebugServer/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedRemoteDebugServer) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedSkillSystem/CMakeLists.txt b/engine/shared/library/sharedSkillSystem/CMakeLists.txt index 0ade0f09..f42afa8a 100644 --- a/engine/shared/library/sharedSkillSystem/CMakeLists.txt +++ b/engine/shared/library/sharedSkillSystem/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedSkillSystem) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedSynchronization/CMakeLists.txt b/engine/shared/library/sharedSynchronization/CMakeLists.txt index 8f499d92..0de62571 100644 --- a/engine/shared/library/sharedSynchronization/CMakeLists.txt +++ b/engine/shared/library/sharedSynchronization/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedSynchronization) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedTerrain/CMakeLists.txt b/engine/shared/library/sharedTerrain/CMakeLists.txt index 4690a6b4..7fd7a27f 100644 --- a/engine/shared/library/sharedTerrain/CMakeLists.txt +++ b/engine/shared/library/sharedTerrain/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedTerrain) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedThread/CMakeLists.txt b/engine/shared/library/sharedThread/CMakeLists.txt index 44b5ae5a..046162b1 100644 --- a/engine/shared/library/sharedThread/CMakeLists.txt +++ b/engine/shared/library/sharedThread/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedThread) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedThread/src/CMakeLists.txt b/engine/shared/library/sharedThread/src/CMakeLists.txt index 3fc1b9f9..a729633f 100644 --- a/engine/shared/library/sharedThread/src/CMakeLists.txt +++ b/engine/shared/library/sharedThread/src/CMakeLists.txt @@ -41,4 +41,5 @@ add_library(sharedThread STATIC target_link_libraries(sharedThread sharedSynchronization + ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/engine/shared/library/sharedUtility/CMakeLists.txt b/engine/shared/library/sharedUtility/CMakeLists.txt index 72836386..bebb2ddb 100644 --- a/engine/shared/library/sharedUtility/CMakeLists.txt +++ b/engine/shared/library/sharedUtility/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedUtility) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedXml/CMakeLists.txt b/engine/shared/library/sharedXml/CMakeLists.txt index fdf5b6fa..cb076e87 100644 --- a/engine/shared/library/sharedXml/CMakeLists.txt +++ b/engine/shared/library/sharedXml/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(sharedXml) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/engine/shared/library/sharedXml/src/CMakeLists.txt b/engine/shared/library/sharedXml/src/CMakeLists.txt index f7510aae..780a4055 100644 --- a/engine/shared/library/sharedXml/src/CMakeLists.txt +++ b/engine/shared/library/sharedXml/src/CMakeLists.txt @@ -38,3 +38,7 @@ add_library(sharedXml STATIC ${SHARED_SOURCES} ${PLATFORM_SOURCES} ) + +target_link_libraries(sharedXml + ${LIBXML2_LIBRARY} +) diff --git a/game/server/application/SwgDatabaseServer/CMakeLists.txt b/game/server/application/SwgDatabaseServer/CMakeLists.txt index 2ee18a3a..7aab42ec 100644 --- a/game/server/application/SwgDatabaseServer/CMakeLists.txt +++ b/game/server/application/SwgDatabaseServer/CMakeLists.txt @@ -3,10 +3,6 @@ cmake_minimum_required(VERSION 2.8) project(SwgDatabaseServer) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt index 635743f0..65bc7e09 100644 --- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt +++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt @@ -147,14 +147,10 @@ if(WIN32) win32/FirstSwgDatabaseServer.cpp win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -196,8 +192,6 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public ) -link_directories(${STLPORT_LIBDIR}) - set(MAKE_SCHEMA_H ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/make_schema_h.pl) file(TO_NATIVE_PATH ${MAKE_SCHEMA_H} MAKE_SCHEMA_H_NATIVE) @@ -346,14 +340,6 @@ target_link_libraries(SwgDatabaseServer localizationArchive unicode unicodeArchive - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} - ${ORACLE_LIBRARY} ) - -if(WIN32) - target_link_libraries(SwgDatabaseServer mswsock ws2_32) -endif() diff --git a/game/server/application/SwgGameServer/CMakeLists.txt b/game/server/application/SwgGameServer/CMakeLists.txt index f3a4416f..f80b3fee 100644 --- a/game/server/application/SwgGameServer/CMakeLists.txt +++ b/game/server/application/SwgGameServer/CMakeLists.txt @@ -3,10 +3,6 @@ cmake_minimum_required(VERSION 2.8) project(SwgGameServer) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt index 22e92eea..2ef6e6f9 100644 --- a/game/server/application/SwgGameServer/src/CMakeLists.txt +++ b/game/server/application/SwgGameServer/src/CMakeLists.txt @@ -49,14 +49,10 @@ if(WIN32) win32/FirstSwgGameServer.cpp win32/WinMain.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() - set(PLATFORM_SOURCES + set(PLATFORM_SOURCES linux/main.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux) endif() include_directories( @@ -106,8 +102,6 @@ include_directories( ${JNI_INCLUDE_DIRS} ) -link_directories(${STLPORT_LIBDIR}) - add_executable(SwgGameServer ${SHARED_SOURCES} ${PLATFORM_SOURCES} @@ -156,16 +150,6 @@ target_link_libraries(SwgGameServer unicode unicodeArchive Base - udplibrary ${STLPORT_LIBRARIES} - ${ZLIB_LIBRARY} - ${PCRE_LIBRARY} - ${LIBXML2_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) - -if(WIN32) - set_target_properties (SwgGameServer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:\"libcmt\"") - target_link_libraries(SwgGameServer mswsock ws2_32) -endif() diff --git a/game/server/library/swgServerNetworkMessages/CMakeLists.txt b/game/server/library/swgServerNetworkMessages/CMakeLists.txt index 1defcd16..f387f91c 100644 --- a/game/server/library/swgServerNetworkMessages/CMakeLists.txt +++ b/game/server/library/swgServerNetworkMessages/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(swgServerNetworkMessages) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/game/server/library/swgServerNetworkMessages/src/CMakeLists.txt b/game/server/library/swgServerNetworkMessages/src/CMakeLists.txt index c33b43db..f2b60117 100644 --- a/game/server/library/swgServerNetworkMessages/src/CMakeLists.txt +++ b/game/server/library/swgServerNetworkMessages/src/CMakeLists.txt @@ -42,8 +42,6 @@ if(WIN32) set(PLATFORM_SOURCES win32/FirstSwgServerNetworkMessages.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() set(PLATFORM_SOURCES "") endif() diff --git a/game/shared/library/swgSharedNetworkMessages/CMakeLists.txt b/game/shared/library/swgSharedNetworkMessages/CMakeLists.txt index 3243bdfe..2d459bf8 100644 --- a/game/shared/library/swgSharedNetworkMessages/CMakeLists.txt +++ b/game/shared/library/swgSharedNetworkMessages/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(swgSharedNetworkMessages) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt b/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt index b2c92420..afb2e6bb 100644 --- a/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt +++ b/game/shared/library/swgSharedNetworkMessages/src/CMakeLists.txt @@ -29,8 +29,6 @@ if(WIN32) set(PLATFORM_SOURCES win32/FirstSwgSharedNetworkMessages.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() set(PLATFORM_SOURCES "") endif() diff --git a/game/shared/library/swgSharedUtility/CMakeLists.txt b/game/shared/library/swgSharedUtility/CMakeLists.txt index bf9392c0..89debff4 100644 --- a/game/shared/library/swgSharedUtility/CMakeLists.txt +++ b/game/shared/library/swgSharedUtility/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(swgSharedUtility) -if(WIN32) - add_definitions(/D_CRT_SECURE_NO_WARNINGS) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public) add_subdirectory(src) diff --git a/game/shared/library/swgSharedUtility/src/CMakeLists.txt b/game/shared/library/swgSharedUtility/src/CMakeLists.txt index 472d7178..9d37ae90 100644 --- a/game/shared/library/swgSharedUtility/src/CMakeLists.txt +++ b/game/shared/library/swgSharedUtility/src/CMakeLists.txt @@ -27,8 +27,6 @@ if(WIN32) set(PLATFORM_SOURCES win32/FirstSwgSharedUtility.cpp ) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32) else() set(PLATFORM_SOURCES "") endif()