From f6e3c5ccef5d689d14e8baec4a98d0b8da478b39 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 4 May 2024 05:16:35 +0200 Subject: [PATCH 1/2] Externals/rcheevos: Disable warnings in CMake --- Externals/rcheevos/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Externals/rcheevos/CMakeLists.txt b/Externals/rcheevos/CMakeLists.txt index 634e46da85..f8d9bee8da 100644 --- a/Externals/rcheevos/CMakeLists.txt +++ b/Externals/rcheevos/CMakeLists.txt @@ -55,6 +55,7 @@ add_library(rcheevos rcheevos/src/rc_version.c rcheevos/src/rc_version.h ) +dolphin_disable_warnings(rcheevos) target_include_directories(rcheevos PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rcheevos/include") target_include_directories(rcheevos INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") From 5d495004567d98bb730ea9d3be1c3d3f9f79d173 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 4 May 2024 05:17:45 +0200 Subject: [PATCH 2/2] DolphinNoGUI: Link against dwmapi.lib on Windows in CMake Required since 2b261b9306b9ab1ab558f79b3e88b1c89e1e8755 --- Source/Core/DolphinNoGUI/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt index 4f10169af1..566a643c89 100644 --- a/Source/Core/DolphinNoGUI/CMakeLists.txt +++ b/Source/Core/DolphinNoGUI/CMakeLists.txt @@ -41,6 +41,11 @@ if(APPLE) ) endif() +if(WIN32) + # needed for adjusting window decorations with DwmSetWindowAttribute + target_link_libraries(dolphin-nogui PRIVATE dwmapi.lib) +endif() + if(MSVC) # Add precompiled header target_link_libraries(dolphin-nogui PRIVATE use_pch)