From 726fde4e8de3ae50df0373476ba1d952c04b7b67 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Wed, 9 Nov 2022 19:44:07 +0100
Subject: Explicitly include the build/res directory so windres will find it
 when using the CMake Makefile generator

---
 res/melon.rc.in                    | 2 +-
 src/frontend/qt_sdl/CMakeLists.txt | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/res/melon.rc.in b/res/melon.rc.in
index 2034461..3f2d8e4 100644
--- a/res/melon.rc.in
+++ b/res/melon.rc.in
@@ -31,4 +31,4 @@ FILETYPE VFT_APP
 	}
 }
 
-1 24 "res/xp.manifest"
+1 24 "xp.manifest"
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index 96686b5..c74ec47 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -60,11 +60,6 @@ else()
     option(USE_QT6 "Build using Qt 6 instead of 5" OFF)
 endif()
 
-
-if (WIN32)
-    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> -o <OBJECT>")
-endif()
-
 if (USE_QT6)
     find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets REQUIRED)
     set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
@@ -159,6 +154,7 @@ elseif (WIN32)
 
     configure_file("${CMAKE_SOURCE_DIR}/res/melon.rc.in" "${CMAKE_BINARY_DIR}/res/melon.rc")
     target_sources(melonDS PUBLIC "${CMAKE_BINARY_DIR}/res/melon.rc")
+    target_include_directories(melonDS PRIVATE "${CMAKE_BINARY_DIR}/res")
 
     if (${ARCHITECTURE} STREQUAL x86_64)
         set(WIN32_ARCHITECTURE amd64)
-- 
cgit v1.2.3