From ca707e53843fd51196656e98aad898588ffc3e3d Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 11 Jan 2020 22:45:33 +0100 Subject: [PATCH] Potential fix for Windows build. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1043e36..57be2bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,14 +60,6 @@ add_library(pkmnLib SHARED ${CORE_SRC_FILES}) SET(_LINKS CreatureLibCore CreatureLibLibrary CreatureLibBattling) SET(_TESTLINKS pkmnLib CreatureLibCore CreatureLibLibrary CreatureLibBattling) -if (SCRIPT_PROVIDER STREQUAL "angelscript") - message(STATUS "Creating angelscript implementation.") - file(GLOB_RECURSE ANGELSCRIPT_SRC_FILES "src/AngelScript/*.cpp" "src/AngelScript/*.hpp" "extern/angelscript_addons/*.cpp" "extern/angelscript_addons/*.h") - add_library(pkmnLib-angelscript SHARED ${ANGELSCRIPT_SRC_FILES} ) - SET(SCRIPT_PROVIDER_LIB_NAME "pkmnLib-angelscript") - SET(_LINKS ${_LINKS} angelscript) -endif() - if (WINDOWS) message(STATUS "Using Windows build.") set(CMAKE_CXX_FLAGS "-L ${CMAKE_BINARY_DIR}/bin") @@ -77,6 +69,14 @@ if (WINDOWS) SET(_TESTLINKS ${_TESTLINKS} -static-libgcc -static-libstdc++) endif (WINDOWS) +if (SCRIPT_PROVIDER STREQUAL "angelscript") + message(STATUS "Creating angelscript implementation.") + file(GLOB_RECURSE ANGELSCRIPT_SRC_FILES "src/AngelScript/*.cpp" "src/AngelScript/*.hpp" "extern/angelscript_addons/*.cpp" "extern/angelscript_addons/*.h") + add_library(pkmnLib-angelscript SHARED ${ANGELSCRIPT_SRC_FILES} ) + SET(SCRIPT_PROVIDER_LIB_NAME "pkmnLib-angelscript") + SET(_LINKS ${_LINKS} angelscript) +endif() + target_link_libraries(pkmnLib PUBLIC ${_LINKS})