Removed unneeded cmake code

engine/server/application/CMakeLists.txt

@@ -1,4 +1,6 @@
 
+link_directories(${STLPORT_LIBDIR})
+
 add_subdirectory(CentralServer)
 add_subdirectory(ChatServer)
 add_subdirectory(CommoditiesServer)

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()

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()

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

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()

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()

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()

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()

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()

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()

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()

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

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()

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}
+)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)
 

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)

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)
 

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)

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)
 

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)

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)

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)

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}
+)

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)

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)

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)

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)

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)

engine/shared/library/sharedThread/src/CMakeLists.txt

@@ -41,4 +41,5 @@ add_library(sharedThread STATIC
 
 target_link_libraries(sharedThread
 	sharedSynchronization
+    ${CMAKE_THREAD_LIBS_INIT}
 )

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)

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)

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}
+)

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)

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()

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)

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()

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)

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()

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)

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()

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)

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()