From 07fa3a2af28ebcc0fc15c97cbc786ac6f7754407 Mon Sep 17 00:00:00 2001 From: Adam <893184+NotAdam@users.noreply.github.com> Date: Tue, 22 Aug 2017 00:05:14 +0900 Subject: [PATCH] Add 64bit lib linkage This was done to reflect this: https://github.com/SapphireMordred/SapphireLibs/pull/6 --- src/servers/Server_Lobby/CMakeLists.txt | 12 ++++++++++-- src/servers/Server_REST/CMakeLists.txt | 12 ++++++++++-- src/servers/Server_Zone/CMakeLists.txt | 12 ++++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/Server_Lobby/CMakeLists.txt index 2330c06f..4f8720fc 100644 --- a/src/servers/Server_Lobby/CMakeLists.txt +++ b/src/servers/Server_Lobby/CMakeLists.txt @@ -61,8 +61,16 @@ include_directories(${Boost_INCLUDE_DIR}) link_directories(${BOOST_LIBRARYDIR}) link_directories(${SERVER_COMMON_DIR}) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib) + +if(CMAKE_SIZEOF_VOID_P EQUAL 4) + # 32 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86) +else() + # 64 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64) +endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt index 74f4c019..4891ea36 100644 --- a/src/servers/Server_REST/CMakeLists.txt +++ b/src/servers/Server_REST/CMakeLists.txt @@ -61,8 +61,16 @@ include_directories(${Boost_INCLUDE_DIR}) link_directories(${BOOST_LIBRARYDIR}) link_directories(${SERVER_COMMON_DIR}) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib) + +if(CMAKE_SIZEOF_VOID_P EQUAL 4) + # 32 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86) +else() +# 64 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64) +endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt index 1c490cdc..3c340c60 100644 --- a/src/servers/Server_Zone/CMakeLists.txt +++ b/src/servers/Server_Zone/CMakeLists.txt @@ -76,8 +76,16 @@ include_directories(${Boost_INCLUDE_DIR}) link_directories(${BOOST_LIBRARYDIR}) link_directories(${SERVER_COMMON_DIR}) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib) + +if(CMAKE_SIZEOF_VOID_P EQUAL 4) + # 32 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86) +else() + # 64 bit link + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64) +endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")