moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 02:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows ARM64 builds on x64 on Qt 6.10.1+

Browse Source
This commit is contained in:
Cameron Gutman
2026-01-31 17:11:56 -06:00
parent 60fd840d7a
commit d878447413
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/build-arch.bat
View File

@@ -33,18 +33,23 @@ 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
rem Locate qmake and determine if we're using qmake.exe or (host-)qmake.bat
rem (host-)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
where host-qmake.bat
if !ERRORLEVEL! EQU 0 (
set QMAKE_CMD=qmake.exe
set QMAKE_CMD=call host-qmake.bat
) else (
echo Unable to find QMake. Did you add Qt bins to your PATH?
goto Error
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
)
)
)
@@ -64,12 +69,17 @@ if not x%QT_PATH:_arm64=%==x%QT_PATH% (
set HOSTBIN_PATH=%QT_PATH:_arm64=_64%
echo HOSTBIN_PATH=!HOSTBIN_PATH!
if exist %QT_PATH%\windeployqt.exe (
echo Using windeployqt.exe from QT_PATH
set WINDEPLOYQT_CMD=windeployqt.exe
) else (
if exist %QT_PATH%\host-qtpaths.bat (
echo Using windeployqt.exe from HOSTBIN_PATH
set WINDEPLOYQT_CMD=!HOSTBIN_PATH!\windeployqt.exe --qtpaths %QT_PATH%\qtpaths.bat
set WINDEPLOYQT_CMD=!HOSTBIN_PATH!\windeployqt.exe --qtpaths %QT_PATH%\host-qtpaths.bat
) else (
if exist %QT_PATH%\windeployqt.exe (
echo Using windeployqt.exe from QT_PATH
set WINDEPLOYQT_CMD=windeployqt.exe
) else (
echo Using windeployqt.exe from HOSTBIN_PATH
set WINDEPLOYQT_CMD=!HOSTBIN_PATH!\windeployqt.exe --qtpaths %QT_PATH%\qtpaths.bat
)
)
) else (
if not x%QT_PATH:_64=%==x%QT_PATH% (