Fix manifest for debug mode. (#2047)

5 files changed, 98 insertions, 93 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8faff52c..10459e7e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,8 +11,13 @@ mo2_configure_executable(organizer
 target_link_libraries(organizer PUBLIC Shlwapi)
 mo2_install_target(organizer)
 
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt6"
 		DESTINATION bin/dlls
+		CONFIGURATIONS Release RelWithDebInfo
+		RENAME dlls.manifest)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.debug.qt6"
+		DESTINATION bin/dlls
+		CONFIGURATIONS Debug
 		RENAME dlls.manifest)
 
 install(DIRECTORY
diff --git a/src/dlls.manifest.debug.qt5 b/src/dlls.manifest.debug.qt5
deleted file mode 100644
index 728c01b2..00000000
--- a/src/dlls.manifest.debug.qt5
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-    <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>

-  <file name="7z.dll"/>

-  <file name="archive.dll"/>

-  <file name="d3dcompiler_47.dll"/>

-  <file name="libbsarch.dll"/>

-  <file name="libcrypto-1_1-x64.dll"/>

-  <file name="libEGL.dll"/>

-  <file name="libGLESV2.dll"/>

-  <file name="liblz4.dll"/>

-  <file name="libssl-1_1-x64.dll"/>

-  <file name="opengl32sw.dll"/>

-  <file name="Qt6Concurrent.dll"/>

-  <file name="Qt6Core.dll"/>

-  <file name="Qt6Core5Compat.dll"/>

-  <file name="Qt6Gui.dll"/>

-  <file name="Qt6Network.dll"/>

-  <file name="Qt6OpenGL.dll"/>

-  <file name="Qt6OpenGLWidgets.dll"/>

-  <file name="Qt6Positioning.dll"/>

-  <file name="Qt6PrintSupport.dll"/>

-  <file name="Qt6Qml.dll"/>

-  <file name="Qt6QmlLocalStorage.dll"/>

-  <file name="Qt6QmlModels.dll"/>

-  <file name="Qt6QmlWorkerScript.dll"/>

-  <file name="Qt6QmlXmlListModel.dll"/>

-  <file name="Qt6Quick.dll"/>

-  <file name="Qt6QuickControls2.dll"/>

-  <file name="Qt6QuickControls2Impl.dll"/>

-  <file name="Qt6QuickDialogs2.dll"/>

-  <file name="Qt6QuickDialogs2QuickImpl.dll"/>

-  <file name="Qt6QuickDialogs2Utils.dll"/>

-  <file name="Qt6QuickLayouts.dll"/>

-  <file name="Qt6QuickParticles.dll"/>

-  <file name="Qt6QuickShapes.dll"/>

-  <file name="Qt6QuickTemplates2.dll"/>

-  <file name="Qt6QuickWidgets.dll"/>

-  <file name="Qt6Sql.dll"/>

-  <file name="Qt6Svg.dll"/>

-  <file name="Qt6WebChannel.dll"/>

-  <file name="Qt6WebEngineCore.dll"/>

-  <file name="Qt6WebEngineWidgets.dll"/>

-  <file name="Qt6WebSockets.dll"/>

-  <file name="Qt6Widgets.dll"/>

-</assembly>

diff --git a/src/dlls.manifest.debug.qt6 b/src/dlls.manifest.debug.qt6
new file mode 100644
index 00000000..18845fba
--- /dev/null
+++ b/src/dlls.manifest.debug.qt6
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86" />
+  <file name="7z.dll" />
+  <file name="archive.dll" />
+  <file name="d3dcompiler_47.dll" />
+  <file name="libbsarch.dll" />
+  <file name="libcrypto-3-x64.dll" />
+  <file name="libEGL.dll" />
+  <file name="libGLESV2.dll" />
+  <file name="liblz4.dll" />
+  <file name="libssl-3-x64.dll" />
+  <file name="opengl32sw.dll" />
+  <file name="Qt6Concurrentd.dll" />
+  <file name="Qt6Cored.dll" />
+  <file name="Qt6Core5Compatd.dll" />
+  <file name="Qt6Guid.dll" />
+  <file name="Qt6Networkd.dll" />
+  <file name="Qt6OpenGLd.dll" />
+  <file name="Qt6OpenGLWidgetsd.dll" />
+  <file name="Qt6Positioningd.dll" />
+  <file name="Qt6PrintSupportd.dll" />
+  <file name="Qt6Qmld.dll" />
+  <file name="Qt6QmlLocalStoraged.dll" />
+  <file name="Qt6QmlModelsd.dll" />
+  <file name="Qt6QmlWorkerScriptd.dll" />
+  <file name="Qt6QmlXmlListModeld.dll" />
+  <file name="Qt6Quickd.dll" />
+  <file name="Qt6QuickControls2d.dll" />
+  <file name="Qt6QuickControls2Impld.dll" />
+  <file name="Qt6QuickDialogs2d.dll" />
+  <file name="Qt6QuickDialogs2QuickImpld.dll" />
+  <file name="Qt6QuickDialogs2Utilsd.dll" />
+  <file name="Qt6QuickLayoutsd.dll" />
+  <file name="Qt6QuickParticlesd.dll" />
+  <file name="Qt6QuickShapesd.dll" />
+  <file name="Qt6QuickTemplates2d.dll" />
+  <file name="Qt6QuickWidgetsd.dll" />
+  <file name="Qt6Sqld.dll" />
+  <file name="Qt6Svgd.dll" />
+  <file name="Qt6WebChanneld.dll" />
+  <file name="Qt6WebEngineCored.dll" />
+  <file name="Qt6WebEngineWidgetsd.dll" />
+  <file name="Qt6WebSocketsd.dll" />
+  <file name="Qt6Widgetsd.dll" />
+</assembly>
diff --git a/src/dlls.manifest.qt5 b/src/dlls.manifest.qt5
deleted file mode 100644
index ebda0f8a..00000000
--- a/src/dlls.manifest.qt5
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>

-  <file name="7z.dll"/>

-  <file name="archive.dll"/>

-  <file name="d3dcompiler_47.dll"/>

-  <file name="libbsarch.dll"/>

-  <file name="libcrypto-1_1-x64.dll"/>

-  <file name="libEGL.dll"/>

-  <file name="libGLESV2.dll"/>

-  <file name="liblz4.dll"/>

-  <file name="libssl-1_1-x64.dll"/>

-  <file name="opengl32sw.dll"/>

-  <file name="Qt6Concurrent.dll"/>

-  <file name="Qt6Core.dll"/>

-  <file name="Qt6Core5Compat.dll"/>

-  <file name="Qt6Gui.dll"/>

-  <file name="Qt6Network.dll"/>

-  <file name="Qt6OpenGL.dll"/>

-  <file name="Qt6OpenGLWidgets.dll"/>

-  <file name="Qt6Positioning.dll"/>

-  <file name="Qt6PrintSupport.dll"/>

-  <file name="Qt6Qml.dll"/>

-  <file name="Qt6QmlLocalStorage.dll"/>

-  <file name="Qt6QmlModels.dll"/>

-  <file name="Qt6QmlWorkerScript.dll"/>

-  <file name="Qt6QmlXmlListModel.dll"/>

-  <file name="Qt6Quick.dll"/>

-  <file name="Qt6QuickControls2.dll"/>

-  <file name="Qt6QuickControls2Impl.dll"/>

-  <file name="Qt6QuickDialogs2.dll"/>

-  <file name="Qt6QuickDialogs2QuickImpl.dll"/>

-  <file name="Qt6QuickDialogs2Utils.dll"/>

-  <file name="Qt6QuickLayouts.dll"/>

-  <file name="Qt6QuickParticles.dll"/>

-  <file name="Qt6QuickShapes.dll"/>

-  <file name="Qt6QuickTemplates2.dll"/>

-  <file name="Qt6QuickWidgets.dll"/>

-  <file name="Qt6Sql.dll"/>

-  <file name="Qt6Svg.dll"/>

-  <file name="Qt6WebChannel.dll"/>

-  <file name="Qt6WebEngineCore.dll"/>

-  <file name="Qt6WebEngineWidgets.dll"/>

-  <file name="Qt6WebSockets.dll"/>

-  <file name="Qt6Widgets.dll"/>

-</assembly>

diff --git a/src/dlls.manifest.qt6 b/src/dlls.manifest.qt6
new file mode 100644
index 00000000..f5d1d9fd
--- /dev/null
+++ b/src/dlls.manifest.qt6
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86" />
+  <file name="7z.dll" />
+  <file name="archive.dll" />
+  <file name="d3dcompiler_47.dll" />
+  <file name="libbsarch.dll" />
+  <file name="libcrypto-3-x64.dll" />
+  <file name="libEGL.dll" />
+  <file name="libGLESV2.dll" />
+  <file name="liblz4.dll" />
+  <file name="libssl-3-x64.dll" />
+  <file name="opengl32sw.dll" />
+  <file name="Qt6Concurrent.dll" />
+  <file name="Qt6Core.dll" />
+  <file name="Qt6Core5Compat.dll" />
+  <file name="Qt6Gui.dll" />
+  <file name="Qt6Network.dll" />
+  <file name="Qt6OpenGL.dll" />
+  <file name="Qt6OpenGLWidgets.dll" />
+  <file name="Qt6Positioning.dll" />
+  <file name="Qt6PrintSupport.dll" />
+  <file name="Qt6Qml.dll" />
+  <file name="Qt6QmlLocalStorage.dll" />
+  <file name="Qt6QmlModels.dll" />
+  <file name="Qt6QmlWorkerScript.dll" />
+  <file name="Qt6QmlXmlListModel.dll" />
+  <file name="Qt6Quick.dll" />
+  <file name="Qt6QuickControls2.dll" />
+  <file name="Qt6QuickControls2Impl.dll" />
+  <file name="Qt6QuickDialogs2.dll" />
+  <file name="Qt6QuickDialogs2QuickImpl.dll" />
+  <file name="Qt6QuickDialogs2Utils.dll" />
+  <file name="Qt6QuickLayouts.dll" />
+  <file name="Qt6QuickParticles.dll" />
+  <file name="Qt6QuickShapes.dll" />
+  <file name="Qt6QuickTemplates2.dll" />
+  <file name="Qt6QuickWidgets.dll" />
+  <file name="Qt6Sql.dll" />
+  <file name="Qt6Svg.dll" />
+  <file name="Qt6WebChannel.dll" />
+  <file name="Qt6WebEngineCore.dll" />
+  <file name="Qt6WebEngineWidgets.dll" />
+  <file name="Qt6WebSockets.dll" />
+  <file name="Qt6Widgets.dll" />
+</assembly>