mirror of
https://bitbucket.org/seefoe/src.git
synced 2026-01-16 23:04:30 -05:00
remove the openssl stuff...can readd later just for DTLS someday
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
2
external/3rd/library/webAPI/CMakeLists.txt
vendored
2
external/3rd/library/webAPI/CMakeLists.txt
vendored
@@ -11,7 +11,5 @@ add_library(webAPI
|
||||
)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CURL_INCLUDE_DIRS}
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
@@ -344,8 +344,6 @@ target_link_libraries(SwgDatabaseServer
|
||||
unicode
|
||||
unicodeArchive
|
||||
webAPI
|
||||
${OPENSSL_CRYPTO_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
)
|
||||
|
||||
@@ -154,8 +154,6 @@ target_link_libraries(SwgGameServer
|
||||
unicodeArchive
|
||||
Base
|
||||
webAPI
|
||||
${OPENSSL_CRYPTO_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user