From 2903a97941f3ff72b2602454fcd3722c008923fe Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sun, 18 Jan 2026 11:32:35 +0100 Subject: [PATCH] build: Make people Acknowledge the GPLv2 in the Windows installer instead of accepting it --- cmake/build_helpers.cmake | 2 + resources/dist/windows/WIX.template.in | 3 +- resources/dist/windows/wix/BrowseDlg.wxs | 34 ++++++ .../dist/windows/wix/LicenseAgreementDlg.wxs | 30 ++++++ .../windows/wix/WixUI_InstallDirImHex.wxs | 102 ++++++++++++++++++ 5 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 resources/dist/windows/wix/BrowseDlg.wxs create mode 100644 resources/dist/windows/wix/LicenseAgreementDlg.wxs create mode 100644 resources/dist/windows/wix/WixUI_InstallDirImHex.wxs diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 80feda4e9..384fe96e0 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -211,6 +211,8 @@ macro(configurePackingResources) set(CPACK_WIX_TEMPLATE "${PROJECT_SOURCE_DIR}/resources/dist/windows/WIX.template.in") set(CPACK_WIX_EXTENSIONS "WixToolset.UI.wixext") + file(GLOB_RECURSE CPACK_WIX_EXTRA_SOURCES "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix/*.wxs") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex") set_property(INSTALL "$" PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex" diff --git a/resources/dist/windows/WIX.template.in b/resources/dist/windows/WIX.template.in index 27b897ee8..941abc57c 100644 --- a/resources/dist/windows/WIX.template.in +++ b/resources/dist/windows/WIX.template.in @@ -28,6 +28,7 @@ + @@ -45,7 +46,7 @@ - + diff --git a/resources/dist/windows/wix/BrowseDlg.wxs b/resources/dist/windows/wix/BrowseDlg.wxs new file mode 100644 index 000000000..5249010c3 --- /dev/null +++ b/resources/dist/windows/wix/BrowseDlg.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/dist/windows/wix/LicenseAgreementDlg.wxs b/resources/dist/windows/wix/LicenseAgreementDlg.wxs new file mode 100644 index 000000000..3ec6b7eab --- /dev/null +++ b/resources/dist/windows/wix/LicenseAgreementDlg.wxs @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/dist/windows/wix/WixUI_InstallDirImHex.wxs b/resources/dist/windows/wix/WixUI_InstallDirImHex.wxs new file mode 100644 index 000000000..1d627a305 --- /dev/null +++ b/resources/dist/windows/wix/WixUI_InstallDirImHex.wxs @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file