Explicitly include the build/res directory so windres will find it when

using the CMake Makefile generator
sinistarZ · Nov 9, 2022 · 726fde4 · 726fde4
1 parent 9587d35
commit 726fde4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,4 @@ FILETYPE VFT_APP @@
     	}
     }
-24 "res/xp.manifest"
+24 "xp.manifest"