Merge pull request colobot#1730 from colobot/dev-fix-mingw

Fix building on MSYS2/MinGW
hexagonrecursion · Aug 17, 2024 · b2a0dea · b2a0dea
2 parents 36ab303 + 6f33a55
commit b2a0dea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,11 +146,6 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()
 
-##
-# Additional settings for MSYS
-##
-include("${colobot_SOURCE_DIR}/cmake/msys.cmake")
-
 ##
 # Additional functions for colobot-lint
 ##

diff --git a/cmake/msys.cmake b/cmake/msys.cmake
diff --git a/cmake/systems/Windows.cmake b/cmake/systems/Windows.cmake
@@ -14,6 +14,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wingetopt)
 
 list(APPEND WINDOWS_ADDITIONAL_LIBRARIES
     wingetopt
+    Dbghelp
 )
 
 # Additional libraries for static runtime
@@ -45,7 +46,6 @@ if(COLOBOT_MSVC_STATIC_RUNTIME)
         wsock32.lib
         ws2_32.lib
         setupapi.lib
-        Dbghelp
     )
 endif()