80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

qt: fix Windows RC file erroneously including the manifest under VS

Browse Source
This commit is contained in:
David Hrdlička
2022-05-24 23:09:29 +02:00
parent 38391a3bd7
commit 91a9df2131
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/CMakeLists.txt
View File

@@ -176,7 +176,7 @@ if(WIN32)
# MSVC linker adds its own manifest to the executable, which fails if
# we include ours in 86Box.rc. We therefore need to pass the manifest
# directly as as a source file, so the linker can use that instead.
set_property(SOURCE ../win/86Box-qt.rc PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
set_property(SOURCE ../win/86Box-qt.rc DIRECTORY .. PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
target_sources(86Box PRIVATE ../win/86Box.manifest)
endif()
@@ -220,6 +220,7 @@ target_link_libraries(
Qt${QT_MAJOR}::Gui
Qt${QT_MAJOR}::OpenGL
Qt${QT_MAJOR}::Network
Threads::Threads
)