From 92670cc05193d6387b0ceffeb9a77fbf44495d7a Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 21 Nov 2022 21:37:16 -0600
Subject: [PATCH] Add support for Qt 6's ARM64 qmake.bat

---
 scripts/build-arch.bat | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/scripts/build-arch.bat b/scripts/build-arch.bat
index 500cbb5d..028bda00 100644
--- a/scripts/build-arch.bat
+++ b/scripts/build-arch.bat
@@ -33,10 +33,25 @@ if /I "%BUILD_CONFIG%"=="debug" (
     )
 )
 
+rem Locate qmake and determine if we're using qmake.exe or qmake.bat
+rem qmake.bat is an ARM64 forwarder to the x64 version of qmake.exe
+where qmake.bat
+if !ERRORLEVEL! EQU 0 (
+    set QMAKE_CMD=call qmake.bat
+) else (
+    where qmake.exe
+    if !ERRORLEVEL! EQU 0 (
+        set QMAKE_CMD=qmake.exe
+    ) else (
+        echo Unable to find QMake. Did you add Qt bins to your PATH?
+        goto Error
+    )
+)
+
 rem Find Qt path to determine our architecture
 for /F %%i in ('where qmake') do set QT_PATH=%%i
 if not x%QT_PATH:_arm64=%==x%QT_PATH% (
-    set ARCH=ARM64
+    set ARCH=arm64
 ) else (
     if not x%QT_PATH:_64=%==x%QT_PATH% (
         set ARCH=x64
@@ -98,7 +113,7 @@ mkdir %SYMBOLS_FOLDER%
 
 echo Configuring the project
 pushd %BUILD_FOLDER%
-qmake %SOURCE_ROOT%\moonlight-qt.pro
+%QMAKE_CMD% %SOURCE_ROOT%\moonlight-qt.pro
 if !ERRORLEVEL! NEQ 0 goto Error
 popd