diff --git a/.drone.yml b/.drone.yml index e72187d..23742e1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,7 +29,7 @@ steps: - update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix - update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-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 + - 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 - cmake --build build-release-windows --target all -- -j 4 - export WINEARCH=win64 - wine build-release-windows/ArbutilsTests.exe -s diff --git a/CMakeLists.txt b/CMakeLists.txt index c587132..0064a29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,15 +21,12 @@ endif() if (WINDOWS) MESSAGE(WARNING, "Using Windows Build.") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -Wl,-allow-multiple-definition") -endif (WINDOWS) - -if (STATICC) + # Statically link libraries we need in Windows. target_link_libraries(Arbutils -static -static-libgcc -static-libstdc++) if (NOT DEFINED CONAN_EXPORTED) target_link_libraries(ArbutilsTests -static -static-libgcc -static-libstdc++) endif() -endif() - +endif (WINDOWS) if (NOT DEFINED CONAN_EXPORTED) target_compile_definitions(ArbutilsTests PRIVATE TESTS_BUILD) diff --git a/conanfile.py b/conanfile.py index 36767b2..094f77e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,8 +7,8 @@ class ArbutilsConan(ConanFile): url = "https://git.p-epsilon.com/Deukhoofd/Arbutils" description = "A helper library for the Epsilon project." settings = "os", "compiler" - options = {"shared": [True, False], "staticC": [True, False]} - default_options = {"shared": True, "staticC": False} + options = {"shared": [True, False]} + default_options = {"shared": True} generators = "cmake" exports_sources = "*" compiler = "clang" @@ -19,8 +19,6 @@ class ArbutilsConan(ConanFile): if self.settings.os == "Windows": self.output.warn("Noticed Windows target, setting Cmake WINDOWS=On.") cmake.definitions["WINDOWS"] = "On" - if self.options.staticC: - cmake.definitions["STATICC"] = "On" cmake.configure() cmake.build()