diff --git a/.drone.yml b/.drone.yml index 2cbe4eb..72767b1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,7 +52,6 @@ steps: - 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 --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 - wine build-release-windows/CreatureLibTests.exe -s - name: conan-deploy diff --git a/CMakeLists.txt b/CMakeLists.txt index e6aa047..fff488f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ endif () # If we need to link the C libraries statically, do so. if (STATICC) message(STATUS "Linking C statically.") - SET(_LIBRARYLINKS ${_LIBRARYLINKS} -static-libgcc -static-libstdc++) + SET(_LIBRARYLINKS ${_LIBRARYLINKS} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread) endif () # And link the libraries together diff --git a/CmakeConanSetup.cmake b/CmakeConanSetup.cmake index cbcc77c..7274e2a 100644 --- a/CmakeConanSetup.cmake +++ b/CmakeConanSetup.cmake @@ -14,7 +14,7 @@ function(SetupConan) -s compiler=clang -s compiler.libcxx=libstdc++11 -o *:shared=True -o *:staticC=${CONAN_STATIC_C}) else () 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 () include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) diff --git a/src/Defines.hpp b/src/Defines.hpp index 147b0e6..eac3cfe 100644 --- a/src/Defines.hpp +++ b/src/Defines.hpp @@ -12,7 +12,7 @@ typedef uint32_t level_int_t; #elif LEVEL_U64 typedef uint64_t level_int_t; #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; #endif