mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11:07:45 +00:00
Code Activity

Link libsodium for VS2015

Browse source
This commit is contained in:
Minho Kang 2017-09-01 18:38:34 +09:00
parent 6f7ec47014
commit f3acd9386e
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/servers/Server_REST/CMakeLists.txt
View file

@ -68,15 +68,30 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link # 32 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v141/static)
else() else()
# 64 bit link # 64 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v141/static)
endif() endif()
# Link libsodium
if(NOT UNIX)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
if (MSVC_VERSION EQUAL 1900) # Visual Studio 2015
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v140/static)
else()
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v141/static)
endif()
else()
if (MSVC_VERSION EQUAL 1900) # Visual Studio 2015
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v140/static)
else()
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v141/static)
endif()
endif()
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
add_dependencies(server_rest Common xivdat) add_dependencies(server_rest Common xivdat)