From acddc3cabdefbee54341dd9dfe292ab447da0558 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 10 Sep 2023 15:40:51 -0500
Subject: [PATCH] Fix ARM64 builds in AppVeyor

We have to replace some files that were built with incorrect paths
---
 appveyor.yml                    |  5 ++++-
 scripts/appveyor/qmake.bat      |  2 ++
 scripts/appveyor/qtpaths.bat    |  2 ++
 scripts/appveyor/target_qt.conf | 15 +++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 scripts/appveyor/qmake.bat
 create mode 100644 scripts/appveyor/qtpaths.bat
 create mode 100644 scripts/appveyor/target_qt.conf

diff --git a/appveyor.yml b/appveyor.yml
index bb8630c5..a9ad945f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,7 +6,7 @@ environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
       QTDIR: C:\Qt\5.15
-      QTDIR_ARM64: C:\Qt\6.4
+      QTDIR_ARM64: C:\Qt\6.4.3
     - APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey
       BUILD_TARGET: macos
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
@@ -40,6 +40,9 @@ before_build:
   - sh: 'export VERSION=`cat app/version.txt`'
 
 build_script:
+  - cmd: 'copy /y scripts\appveyor\qmake.bat %QTDIR_ARM64%\msvc2019_arm64\bin\'
+  - cmd: 'copy /y scripts\appveyor\qtpaths.bat %QTDIR_ARM64%\msvc2019_arm64\bin\'
+  - cmd: 'copy /y scripts\appveyor\target_qt.conf %QTDIR_ARM64%\msvc2019_arm64\bin\'
   - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_64\bin'
   - cmd: 'scripts\build-arch.bat Release'
   - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019\bin'
diff --git a/scripts/appveyor/qmake.bat b/scripts/appveyor/qmake.bat
new file mode 100644
index 00000000..cfe702bc
--- /dev/null
+++ b/scripts/appveyor/qmake.bat
@@ -0,0 +1,2 @@
+@echo off
+%QTDIR_ARM64%\msvc2019_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %*
diff --git a/scripts/appveyor/qtpaths.bat b/scripts/appveyor/qtpaths.bat
new file mode 100644
index 00000000..52e639df
--- /dev/null
+++ b/scripts/appveyor/qtpaths.bat
@@ -0,0 +1,2 @@
+@echo off
+%QTDIR_ARM64%\msvc2019_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %*
diff --git a/scripts/appveyor/target_qt.conf b/scripts/appveyor/target_qt.conf
new file mode 100644
index 00000000..97f4f42e
--- /dev/null
+++ b/scripts/appveyor/target_qt.conf
@@ -0,0 +1,15 @@
+[DevicePaths]
+Prefix=C:/Qt/Qt-6.4.3
+[Paths]
+Prefix=../
+HostPrefix=../../msvc2019_64
+HostBinaries=bin
+HostLibraries=lib
+HostLibraryExecutables=./bin
+HostData=../msvc2019_arm64
+Sysroot=
+SysrootifyPrefix=false
+TargetSpec=win32-arm64-msvc
+HostSpec=
+Documentation=../../Docs/Qt-6.4.3
+Examples=../../Examples/Qt-6.4.3
\ No newline at end of file