Skip to content

Commit

Permalink
Fix manifest for debug mode. (#2047)
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 authored Jun 10, 2024
1 parent fff03d3 commit 3d8bfdd
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 93 deletions.
7 changes: 6 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 0 additions & 46 deletions src/dlls.manifest.debug.qt5

This file was deleted.

46 changes: 46 additions & 0 deletions src/dlls.manifest.debug.qt6
Original file line number Diff line number Diff line change
@@ -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>
46 changes: 0 additions & 46 deletions src/dlls.manifest.qt5

This file was deleted.

46 changes: 46 additions & 0 deletions src/dlls.manifest.qt6
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 3d8bfdd

Please sign in to comment.