diff --git a/.drone.yml b/.drone.yml index afe5d83..2516cc2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,6 +37,7 @@ steps: - 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 - cmake --build build-release-windows --target all -- -j 4 - export WINEARCH=win64 + - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/bin/ - wine build-release-windows/ArbutilsTests.exe -s - name: conan-deploy image: deukhoofd/linux64builder diff --git a/CMakeLists.txt b/CMakeLists.txt index e191489..b24907b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,9 +28,9 @@ if (WINDOWS) endif (WINDOWS) if (STATICC) - target_link_libraries(Arbutils -static -static-libgcc -static-libstdc++) + target_link_libraries(Arbutils -static-libgcc -static-libstdc++) if (NOT DEFINED CONAN_EXPORTED) - target_link_libraries(ArbutilsTests -static -static-libgcc -static-libstdc++) + target_link_libraries(ArbutilsTests -static-libgcc -static-libstdc++) endif() endif(STATICC)