ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

using the CMake Makefile generator
This commit is contained in:
Nadia Holmquist Pedersen 2022-11-09 19:44:07 +01:00
parent 9587d35d1d
commit 726fde4e8d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/melon.rc.in
View File

@ -31,4 +31,4 @@ FILETYPE VFT_APP
} }
} }
1 24 "res/xp.manifest" 1 24 "xp.manifest"

6
src/frontend/qt_sdl/CMakeLists.txt
View File

@ -60,11 +60,6 @@ else()
option(USE_QT6 "Build using Qt 6 instead of 5" OFF) option(USE_QT6 "Build using Qt 6 instead of 5" OFF)
endif() endif()
if (WIN32)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> -o <OBJECT>")
endif()
if (USE_QT6) if (USE_QT6)
find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets REQUIRED) 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) 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") 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_sources(melonDS PUBLIC "${CMAKE_BINARY_DIR}/res/melon.rc")
target_include_directories(melonDS PRIVATE "${CMAKE_BINARY_DIR}/res")
if (${ARCHITECTURE} STREQUAL x86_64) if (${ARCHITECTURE} STREQUAL x86_64)
set(WIN32_ARCHITECTURE amd64) set(WIN32_ARCHITECTURE amd64)