diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2022-11-09 19:44:07 +0100 |
|---|---|---|
| committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2022-11-09 19:44:07 +0100 |
| commit | 726fde4e8de3ae50df0373476ba1d952c04b7b67 (patch) | |
| tree | a442622f8f82e2cc586cae21b990b6f297f38858 | |
| parent | 9587d35d1d14e94c0996261111a17576d72b56b9 (diff) | |
Explicitly include the build/res directory so windres will find it when
using the CMake Makefile generator
| -rw-r--r-- | res/melon.rc.in | 2 | ||||
| -rw-r--r-- | 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) |