From 7e6136e48a921e045b8cf5f597ea9cce9c142f59 Mon Sep 17 00:00:00 2001 From: GokuWeedLord Date: Sun, 10 Dec 2017 21:43:35 +1100 Subject: [PATCH] scripts now link properly with server_zone --- scripts/native/CMakeLists.txt | 3 +-- src/servers/Server_Zone/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt index 2fd7333e..6ee42ae3 100644 --- a/scripts/native/CMakeLists.txt +++ b/scripts/native/CMakeLists.txt @@ -10,9 +10,8 @@ include_directories("../../src/servers/Server_Zone/") foreach(_sourcefile "${SCRIPT_FILES}") get_filename_component(_file "${_sourcefile}" NAME_WE) add_library("${_file}" MODULE "${_sourcefile}" "${SCRIPT_INCLUDE_FILES}") - message("adding library ${_file}") - add_dependencies("${_file}" server_zone) + target_link_libraries("${_file}" server_zone) set_target_properties("${_file}" PROPERTIES CXX_STANDARD 14 diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt index 308f3ab7..bfb8183f 100644 --- a/src/servers/Server_Zone/CMakeLists.txt +++ b/src/servers/Server_Zone/CMakeLists.txt @@ -46,6 +46,8 @@ set_target_properties(server_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/"