CMake: fix build on Windows

flyinghead · Jan 4, 2025 · ed00187 · ed00187
1 parent e18ada7
commit ed00187
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ cmake-build-*/
 # Dependencies from .gitmodules
 core/deps/breakpad/
 core/deps/glslang/
+.cache/
+compile_commands.json
+CMakeUserPresets.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -364,7 +364,8 @@ if(USE_OPENMP)
 	find_package(OpenMP)
 	if(OpenMP_CXX_FOUND)
 		if(MINGW)
-			target_link_libraries(${PROJECT_NAME} PRIVATE "-static -lgomp -lpthread")
+			target_link_libraries(${PROJECT_NAME} PRIVATE -lpthread)
+			target_link_options(${PROJECT_NAME} PRIVATE -fopenmp -static)
 			target_compile_options(${PROJECT_NAME} PRIVATE -fopenmp)
 		elseif(ANDROID)
 			# Reference: https://android.googlesource.com/platform/ndk/+/refs/heads/master/tests/device/openmp/CMakeLists.txt
@@ -1881,7 +1882,7 @@ if(NOT LIBRETRO)
 			endif()
 
 			target_sources(${PROJECT_NAME} PRIVATE shell/windows/flycast.rc)
-			target_link_libraries(${PROJECT_NAME} PRIVATE dsound winmm ws2_32 wsock32 xinput9_1_0 cfgmgr32 wininet)
+			target_link_libraries(${PROJECT_NAME} PRIVATE dsound winmm ws2_32 wsock32 xinput9_1_0 cfgmgr32 wininet psapi)
 		endif()
 	endif()
 endif()

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,23 @@
+{
+    "version": 2,
+    "configurePresets": [
+        {
+            "name": "clang",
+            "generator": "Ninja",
+            "binaryDir": "build-clang",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "gcc",
+            "generator": "Ninja",
+            "binaryDir": "build-gcc",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        }
+    ]
+}