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

Tweaks and fixes for Windows
continuous-integration/drone/push Build is failing Details 

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd 2020-08-20 15:12:19 +02:00
parent a6bfac61a8
commit a5d5257420
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@ -52,7 +52,6 @@ steps:
- update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON -DTESTS=ON - cmake -DCMAKE_BUILD_TYPE=Release . -B build-release-windows -D CMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc -D CMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DWINDOWS=ON -DSTATICC=ON -DTESTS=ON
- cmake --build build-release-windows --target all -- -j 4 - cmake --build build-release-windows --target all -- -j 4
- cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/
- export WINEARCH=win64 - export WINEARCH=win64
- wine build-release-windows/CreatureLibTests.exe -s - wine build-release-windows/CreatureLibTests.exe -s
- name: conan-deploy - name: conan-deploy

2
CMakeLists.txt
View File

@ -68,7 +68,7 @@ endif ()
# If we need to link the C libraries statically, do so. # If we need to link the C libraries statically, do so.
if (STATICC) if (STATICC)
message(STATUS "Linking C statically.") message(STATUS "Linking C statically.")
SET(_LIBRARYLINKS ${_LIBRARYLINKS} -static-libgcc -static-libstdc++) SET(_LIBRARYLINKS ${_LIBRARYLINKS} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread)
endif () endif ()
# And link the libraries together # And link the libraries together

2
CmakeConanSetup.cmake
View File

@ -14,7 +14,7 @@ function(SetupConan)
-s compiler=clang -s compiler.libcxx=libstdc++11 -o *:shared=True -o *:staticC=${CONAN_STATIC_C}) -s compiler=clang -s compiler.libcxx=libstdc++11 -o *:shared=True -o *:staticC=${CONAN_STATIC_C})
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.libcxx=libstdc++11 -s os=Windows -o *:shared=True -o *:staticC=${CONAN_STATIC_C}) -s compiler=gcc -s compiler.version=10.2 -s compiler.libcxx=libstdc++11 -s os=Windows -o *:shared=True -o *:staticC=${CONAN_STATIC_C})
endif () endif ()
endif () endif ()
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)

2
src/Defines.hpp
View File

@ -12,7 +12,7 @@ typedef uint32_t level_int_t;
#elif LEVEL_U64 #elif LEVEL_U64
typedef uint64_t level_int_t; typedef uint64_t level_int_t;
#else #else
#warning Level size wasn't specified, falling back to uint8_t #warning Level size was not specified, falling back to uint8_t
typedef uint8_t level_int_t; typedef uint8_t level_int_t;
#endif #endif