Update to CreatureLib merging into one library.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-07-31 10:57:48 +02:00
parent 770d3be466
commit f55033b8a2
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
1 changed files with 4 additions and 4 deletions

View File

@ -62,15 +62,15 @@ if (SCRIPT_PROVIDER STREQUAL "angelscript")
"extern/angelscript_addons/*.h" "extern/angelscript_addons/*.h"
"CInterface/AngelScript/*.cpp" "CInterface/AngelScript/*.cpp"
"CInterface/AngelScript/*.hpp" "CInterface/AngelScript/*.hpp"
) )
ADD_DEFINITIONS(-D AS_USE_ACCESSORS=1) ADD_DEFINITIONS(-D AS_USE_ACCESSORS=1)
endif() endif ()
file(GLOB_RECURSE CORE_SRC_FILES ${FILE_SOURCE}) file(GLOB_RECURSE CORE_SRC_FILES ${FILE_SOURCE})
add_library(pkmnLib ${LIBTYPE} ${CORE_SRC_FILES}) add_library(pkmnLib ${LIBTYPE} ${CORE_SRC_FILES})
SET(_LINKS CreatureLibLibrary CreatureLibBattling Arbutils) SET(_LINKS CreatureLib Arbutils)
SET(_TESTLINKS pkmnLib CreatureLibLibrary CreatureLibBattling Arbutils) SET(_TESTLINKS pkmnLib CreatureLib Arbutils)
if (SCRIPT_PROVIDER STREQUAL "angelscript") if (SCRIPT_PROVIDER STREQUAL "angelscript")
message(STATUS "Using Angelscript as script provider.") message(STATUS "Using Angelscript as script provider.")