From 4b297f3b033a5aa91b78d3ae130f7512d410f4af Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 11 Jan 2017 07:43:27 +0000 Subject: [PATCH] remove the openssl stuff...can readd later just for DTLS someday --- CMakeLists.txt | 11 ----------- .../application/CentralServer/src/CMakeLists.txt | 6 ++---- .../application/ConnectionServer/src/CMakeLists.txt | 6 ++---- .../server/application/LogServer/src/CMakeLists.txt | 6 ++---- .../server/application/LoginServer/src/CMakeLists.txt | 6 ++---- .../application/PlanetServer/src/CMakeLists.txt | 6 ++---- external/3rd/library/webAPI/CMakeLists.txt | 2 -- .../application/SwgDatabaseServer/src/CMakeLists.txt | 2 -- .../application/SwgGameServer/src/CMakeLists.txt | 2 -- 9 files changed, 10 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb2176af..56781220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,17 +30,6 @@ find_package(Perl REQUIRED) find_package(Threads) find_package(ZLIB REQUIRED) find_package(CURL REQUIRED) -find_library(OpenSSL REQUIRED) - -message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") -message("OpenSSL libraries: ${OPENSSL_LIBRARIES}") -message("OpenSSL crypo lib: ${OPENSSL_CRYPTO_LIBRARY}") - -if(${OPENSSL_INCLUDE_DIR} STREQUAL "" OR ${OPENSSL_LIBRARIES} STREQUAL "" OR ${OPENSSL_CRYPTO_LIBRARY} STREQUAL "") - message(FATAL_ERROR "Could not find OpenSSL - you may have to specify the paths") -else() - message(STATUS "Found OpenSSL") -endif() # c++14 yeah! set(CMAKE_CXX_STANDARD 14) diff --git a/engine/server/application/CentralServer/src/CMakeLists.txt b/engine/server/application/CentralServer/src/CMakeLists.txt index 333d0b3d..4354e1ad 100755 --- a/engine/server/application/CentralServer/src/CMakeLists.txt +++ b/engine/server/application/CentralServer/src/CMakeLists.txt @@ -154,7 +154,7 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/projects ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/utils ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary - ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI + ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI ) add_executable(CentralServer @@ -191,9 +191,7 @@ target_link_libraries(CentralServer localizationArchive unicode unicodeArchive - webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} + webAPI ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/ConnectionServer/src/CMakeLists.txt b/engine/server/application/ConnectionServer/src/CMakeLists.txt index 8ea50e76..67a46a8a 100644 --- a/engine/server/application/ConnectionServer/src/CMakeLists.txt +++ b/engine/server/application/ConnectionServer/src/CMakeLists.txt @@ -108,9 +108,7 @@ target_link_libraries(ConnectionServer Base CommonAPI LoginAPI - webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} + webAPI + ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/LogServer/src/CMakeLists.txt b/engine/server/application/LogServer/src/CMakeLists.txt index d54eb5c1..73393bcf 100644 --- a/engine/server/application/LogServer/src/CMakeLists.txt +++ b/engine/server/application/LogServer/src/CMakeLists.txt @@ -77,9 +77,7 @@ target_link_libraries(LogServer localizationArchive unicode unicodeArchive - webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} + webAPI + ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/LoginServer/src/CMakeLists.txt b/engine/server/application/LoginServer/src/CMakeLists.txt index 92b66174..03f39400 100644 --- a/engine/server/application/LoginServer/src/CMakeLists.txt +++ b/engine/server/application/LoginServer/src/CMakeLists.txt @@ -52,8 +52,8 @@ set(SHARED_SOURCES shared/TaskGetClusterList.h shared/TaskGetValidationData.cpp shared/TaskGetValidationData.h - shared/TaskMapAccount.h - shared/TaskMapAccount.cpp + shared/TaskMapAccount.h + shared/TaskMapAccount.cpp shared/TaskRegisterNewCluster.cpp shared/TaskRegisterNewCluster.h shared/TaskRenameCharacter.cpp @@ -157,8 +157,6 @@ target_link_libraries(LoginServer LoginAPI MonAPI2 webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/engine/server/application/PlanetServer/src/CMakeLists.txt b/engine/server/application/PlanetServer/src/CMakeLists.txt index ddc9fabc..615d618e 100644 --- a/engine/server/application/PlanetServer/src/CMakeLists.txt +++ b/engine/server/application/PlanetServer/src/CMakeLists.txt @@ -106,9 +106,7 @@ target_link_libraries(PlanetServer localizationArchive unicode unicodeArchive - webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} + webAPI + ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/external/3rd/library/webAPI/CMakeLists.txt b/external/3rd/library/webAPI/CMakeLists.txt index 0aa15c87..881f54a9 100644 --- a/external/3rd/library/webAPI/CMakeLists.txt +++ b/external/3rd/library/webAPI/CMakeLists.txt @@ -11,7 +11,5 @@ add_library(webAPI ) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} ${CURL_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} ) diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt index effbb220..cd86b830 100644 --- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt +++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt @@ -344,8 +344,6 @@ target_link_libraries(SwgDatabaseServer unicode unicodeArchive webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt index 9e525fb6..77d3885d 100644 --- a/game/server/application/SwgGameServer/src/CMakeLists.txt +++ b/game/server/application/SwgGameServer/src/CMakeLists.txt @@ -154,8 +154,6 @@ target_link_libraries(SwgGameServer unicodeArchive Base webAPI - ${OPENSSL_CRYPTO_LIBRARY} - ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_DL_LIBS} )