From 5b08a8ea741317079443293f5e9966eeb300c2ef Mon Sep 17 00:00:00 2001
From: uncor3 <contactuncor3@gmail.com>
Date: Tue, 4 Nov 2025 14:23:24 -0800
Subject: [PATCH] fix windows build

---
 .github/workflows/build-windows.yml |  4 +++-
 CMakeLists.txt                      | 15 +++++----------
 cmake/win-deploy.cmake              |  7 +++++--
 lib/airplay                         |  2 +-
 lib/ipatool-go                      |  2 +-
 lib/win-ifuse                       |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index a2bdfbf..0809b81 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -182,14 +182,16 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$Qt6_DIR"
+          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$Qt6_DIR" -DNO_DEPLOY=""
 
       - name: Build with CMake
         run: cmake --build build --config Release
 
       - name: Install & CPack
         working-directory: build
+        shell: bash
         run: |
+          export PATH="$PATH:/c/Users/runneradmin/.dotnet/tools"
           cmake --install .
           cpack .
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e4810e..4a41645 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,7 @@ add_subdirectory(lib/ipatool-go)
 add_subdirectory(lib/zupdater)
 
 if (WIN32) 
+    set(NO_DEPLOY_WIN_IFUSE ON) 
     add_subdirectory(lib/win-ifuse)
 endif()
 
@@ -320,6 +321,8 @@ if(WIN32 AND NOT DEFINED NO_DEPLOY)
             -DMSYS2_BIN_PATH=C:/msys64/mingw64/bin
             -DOUTPUT_DIR=$<TARGET_FILE_DIR:iDescriptor>
             -DQML_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/qml
+            -DPROJECT_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+            -DWIN_IFUSE=$<TARGET_FILE:win-ifuse>
             -P ${CMAKE_CURRENT_LIST_DIR}/cmake/win-deploy.cmake
         COMMENT "Deploying Windows application with all dependencies"
         VERBATIM
@@ -351,6 +354,8 @@ if(WIN32)
                 -DMSYS2_BIN_PATH=\"C:/msys64/mingw64/bin\"
                 -DOUTPUT_DIR=\"\${CMAKE_INSTALL_PREFIX}\"
                 -DQML_SOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/qml\"
+                -DPROJECT_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"
+                -DWIN_IFUSE=$<TARGET_FILE:win-ifuse>
                 -P \"${CMAKE_CURRENT_LIST_DIR}/cmake/win-deploy.cmake\"
         )
     ")
@@ -394,13 +399,3 @@ endif()
 
 include(CPack)
 
-
-# FIXME: move to win-deploy.cmake
-if(WIN32)
-    add_custom_command(TARGET iDescriptor POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy
-            $<TARGET_FILE:win-ifuse>
-            $<TARGET_FILE_DIR:iDescriptor>
-    COMMENT "Copying win-ifuse executable to output directory"
-    )
-endif()
diff --git a/cmake/win-deploy.cmake b/cmake/win-deploy.cmake
index 45bade9..00f3c29 100644
--- a/cmake/win-deploy.cmake
+++ b/cmake/win-deploy.cmake
@@ -9,6 +9,7 @@ string(REPLACE "\"" "" MSYS2_BIN_PATH "${MSYS2_BIN_PATH}")
 if(QML_SOURCE_DIR)
     string(REPLACE "\"" "" QML_SOURCE_DIR "${QML_SOURCE_DIR}")
 endif()
+string(REPLACE "\"" "" PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
 
 message("=== Starting Windows deployment for: ${EXECUTABLE_PATH} ===")
 message("Debug info:")
@@ -233,9 +234,11 @@ message("Copying executables")
 file(COPY C:/msys64/mingw64/bin/iproxy.exe DESTINATION ${OUTPUT_DIR})
 
 message("Copying required scripts")
-file(COPY "${CMAKE_SOURCE_DIR}/install-apple-drivers.ps1" DESTINATION ${OUTPUT_DIR})
-file(COPY "${CMAKE_SOURCE_DIR}/install-win-fsp.silent.bat" DESTINATION ${OUTPUT_DIR})
+file(COPY "${PROJECT_SOURCE_DIR}/install-apple-drivers.ps1" DESTINATION ${OUTPUT_DIR})
+file(COPY "${PROJECT_SOURCE_DIR}/install-win-fsp.silent.bat" DESTINATION ${OUTPUT_DIR})
 
+message("Copying win-ifuse executable")
+file(COPY "${WIN_IFUSE}" DESTINATION ${OUTPUT_DIR})
 
 message("Copying winfsp-x64.dll")
 file(COPY "C:/Program Files (x86)/WinFsp/bin/winfsp-x64.dll" DESTINATION ${OUTPUT_DIR})
diff --git a/lib/airplay b/lib/airplay
index 200284b..0252d7d 160000
--- a/lib/airplay
+++ b/lib/airplay
@@ -1 +1 @@
-Subproject commit 200284b84417d555ba1de0f82fef7c99951617c6
+Subproject commit 0252d7d505581113995050397a149d4d4e309a50
diff --git a/lib/ipatool-go b/lib/ipatool-go
index 6aede7e..5affabd 160000
--- a/lib/ipatool-go
+++ b/lib/ipatool-go
@@ -1 +1 @@
-Subproject commit 6aede7e92bc338ff7cb8f9e7672bc1a39c35aaba
+Subproject commit 5affabd2b4482c66201d1de5eca8c0c008d2a15e
diff --git a/lib/win-ifuse b/lib/win-ifuse
index 0fb1e94..190558b 160000
--- a/lib/win-ifuse
+++ b/lib/win-ifuse
@@ -1 +1 @@
-Subproject commit 0fb1e94efe821f44153feafb4f460adf4b7c5c57
+Subproject commit 190558b49b9fc2e45e645e6c2cf89d01958b450f