From 4914a34dd9b9e2d7bd4e58647dfef9287c6edf34 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 8 Dec 2025 21:26:18 +0100
Subject: [PATCH] build: Fix WiX patch

---
 cmake/build_helpers.cmake            | 6 +++++-
 resources/dist/windows/wix_patch.xml | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index 4163cc8ff..e144567f1 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -210,7 +210,11 @@ macro(configurePackingResources)
             set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_banner.png")
             set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png")
             set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU")
-            set(CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_patch.xml")
+
+            if (NOT MSVC)
+                set(CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_patch.xml")
+            endif()
+
             set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex")
             set_property(INSTALL "$<TARGET_FILE_NAME:main>"
                     PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
diff --git a/resources/dist/windows/wix_patch.xml b/resources/dist/windows/wix_patch.xml
index 17385b82d..6a35c595f 100644
--- a/resources/dist/windows/wix_patch.xml
+++ b/resources/dist/windows/wix_patch.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CPackWiXPatch>
-    <CPackWiXFragment Id="CM_CP_bin.libwinpthread_1.dll">
-        <File Id="CM_FP_bin.libwinpthread_1.dll"
-              CompanionFile="CM_FP_bin.your_main_executable.exe"/>
+    <!-- libwinpthread has a bogus FILEVERSION field that's hardcoded to 1.0.0.0. Ignore it and always install it-->
+    <CPackWiXFragment Id="CM_FP_libwinpthread_1.dll">
+        <File Id="CM_FP_libwinpthread_1.dll"
+              CompanionFile="CM_FP_imhex.exe"/>
     </CPackWiXFragment>
 </CPackWiXPatch>
\ No newline at end of file