From d4cb28f99f327c94a1ce613fbe398f10385b583a Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 22 Sep 2018 15:04:18 +0200
Subject: [PATCH] Another build fix attempt

---
 src/servers/sapphire_lobby/CMakeLists.txt | 43 ++++++++++++---------
 src/servers/sapphire_zone/CMakeLists.txt  | 47 +++++++++++++----------
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
index 3470f06f..a063ef63 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -1,22 +1,29 @@
-cmake_minimum_required( VERSION 2.6 )
-cmake_policy( SET CMP0015 NEW )
-project( Sapphire )
+cmake_minimum_required(VERSION 3.0.2)
+cmake_policy(SET CMP0015 NEW)
+project(Sapphire)
 
-file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
-file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.cpp" )
+file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
+file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-add_executable( sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
 
-set_target_properties( sapphire_lobby PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS ON
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-)
+add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
-target_link_libraries( sapphire_lobby common )
-cotire( sapphire_lobby )
+set_target_properties(sapphire_lobby PROPERTIES
+        CXX_STANDARD 14
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS ON
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        )
+
+if (UNIX)
+    target_link_libraries(sapphire_lobby common pthread dl z)
+else()
+    target_link_libraries(sapphire_lobby common zlib1)
+endif()
+
+target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+cotire( sapphire_lobby )
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index bca1efd6..ba454f5c 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required( VERSION 3.0.2 )
-cmake_policy( SET CMP0015 NEW )
-cmake_policy( SET CMP0014 OLD )
+cmake_minimum_required(VERSION 3.0.2)
+cmake_policy(SET CMP0015 NEW)
+cmake_policy(SET CMP0014 OLD)
 
-project( sapphire_zone )
+project(sapphire_zone)
 
-file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.c*
         Actor/*.c*
         Action/*.c*
@@ -22,25 +22,32 @@ file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 
 add_executable( sapphire_zone ${SERVER_SOURCE_FILES} )
 
-set_target_properties( sapphire_zone PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS ON
-    ENABLE_EXPORTS ON
-    WINDOWS_EXPORT_ALL_SYMBOLS ON
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-    VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-)
+set_target_properties(sapphire_zone PROPERTIES
+        CXX_STANDARD 14
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS ON
+        ENABLE_EXPORTS ON
+        WINDOWS_EXPORT_ALL_SYMBOLS ON
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
+        )
 
 target_link_libraries( sapphire_zone common )
 
-target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
+if (UNIX)
+    target_link_libraries( sapphire_zone pthread )
+    target_link_libraries( sapphire_zone dl )
+    target_link_libraries( sapphire_zone z )
+else()
+    target_link_libraries( sapphire_zone zlib1 )
+endif()
 
+target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 if (UNIX)
-  cotire( sapphire_zone )
-endif()
+    cotire( sapphire_zone )
+endif()
\ No newline at end of file