From 0260f3688ee2c0237270762e474e78636aee4cb7 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Tue, 21 Apr 2020 10:22:17 +0200
Subject: [PATCH] Revert "Don't link C libraries statically by default for
 Windows, as this isn't needed if another library has their own C libraries
 already has them statically linked."

This reverts commit e35f860b
---
 .drone.yml     | 2 +-
 CMakeLists.txt | 5 +----
 conanfile.py   | 6 ++----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8b2dce1..5d45321 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,7 +45,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
       - cp /drone/src/build-release-windows/lib/* /drone/src/build-release-windows/bin/
       - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /drone/src/build-release-windows/bin/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9f79ef..943a664 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,15 +61,12 @@ if (WINDOWS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L ${CMAKE_BINARY_DIR}/bin")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -Wl,-allow-multiple-definition")
     # Statically link libraries we need in Windows.
-endif (WINDOWS)
-
-if (STATICC)
     target_link_libraries(CreatureLibLibrary -static-libgcc -static-libstdc++)
     target_link_libraries(CreatureLibBattling -static-libgcc -static-libstdc++)
     if (NOT DEFINED CONAN_EXPORTED)
         target_link_libraries(CreatureLibTests -static-libgcc -static-libstdc++)
     endif ()
-endif ()
+endif (WINDOWS)
 
 if (NOT DEFINED CONAN_EXPORTED)
     MESSAGE(WARNING, "Called from Conan. Not building test build.")
diff --git a/conanfile.py b/conanfile.py
index 134f22c..8119a3a 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -7,8 +7,8 @@ class CreatureLibConan(ConanFile):
     url = "https://git.p-epsilon.com/Deukhoofd/CreatureLib"
     description = "The core implementation for turn based battling using creatures."
     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 CreatureLibConan(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()