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

Update angelscript.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-12-07 18:01:10 +01:00
parent fff926b617
commit 9d4da515bf
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -119,6 +119,9 @@ if (WINDOWS)
# -m64: Build a 64 bit library # -m64: Build a 64 bit library
add_compile_options(-m64) add_compile_options(-m64)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-allow-multiple-definition") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-allow-multiple-definition")
if (SHARED)
set_target_properties(pkmnLib PROPERTIES SUFFIX ".dll")
endif(SHARED)
endif (WINDOWS) endif (WINDOWS)
if (NOT WINDOWS) if (NOT WINDOWS)
@ -127,10 +130,13 @@ endif ()
if (STATICC) if (STATICC)
message(STATUS "Linking C library statically") message(STATUS "Linking C library statically")
SET(_LINKS ${_LINKS} -static-libgcc -static-libstdc++) SET(_LINKS ${_LINKS} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread)
endif() endif()
target_link_libraries(pkmnLib PUBLIC ${_LINKS}) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
target_link_libraries(pkmnLib PUBLIC ${_LINKS} Threads::Threads)
if (TESTS) if (TESTS)
# Create Test executable # Create Test executable

1
CmakeConanSetup.cmake
View File

@ -21,6 +21,7 @@ function(SetupConan)
else () else ()
execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build outdated
-s compiler=gcc -s compiler=gcc
-s compiler.version=10.2
-s compiler.libcxx=libstdc++11 -s compiler.libcxx=libstdc++11
-s os=Windows -s os=Windows
-o *:shared=True -o *:shared=True

2
conanfile.py
View File

@ -53,6 +53,6 @@ class PkmnLibConan(ConanFile):
self.requires("Arbutils/latest@epsilon/master") self.requires("Arbutils/latest@epsilon/master")
self.requires("CreatureLib/latest@epsilon/master") self.requires("CreatureLib/latest@epsilon/master")
if self.options.script_handler == "angelscript": if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd") self.requires("AngelScript/2.35@AngelScript/Deukhoofd")
else: else:
raise ConanInvalidConfiguration("Invalid Script Handler was specified: " + self.options.script_handler) raise ConanInvalidConfiguration("Invalid Script Handler was specified: " + self.options.script_handler)