Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update CreatureLib version to resolve uninit error.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-02-02 14:53:44 +01:00
parent 419e573bbe
commit 31676fd900
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -11,6 +11,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (NOT SCRIPT_PROVIDER) if (NOT SCRIPT_PROVIDER)
message(WARNING "Script provider was not set, using angelscript as default.") message(WARNING "Script provider was not set, using angelscript as default.")
set(SCRIPT_PROVIDER "angelscript") set(SCRIPT_PROVIDER "angelscript")
ADD_DEFINITIONS(-D ANGELSCRIPT=1)
endif() endif()
if (WINDOWS) if (WINDOWS)

2
conanfile.py
View File

@ -40,7 +40,7 @@ class PkmnLibConan(ConanFile):
self.options["AngelScript"].link_std_statically = True self.options["AngelScript"].link_std_statically = True
def requirements(self): def requirements(self):
self.requires("CreatureLib/fc5826edb1d164a261a33aebb164af7df8ab7ef4@creaturelib/master") self.requires("CreatureLib/c3b573c7daa3f2815e063c9dabfaa5dbfe6dbb20@creaturelib/master")
if self.options.script_handler == "angelscript": if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd") self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
else: else: