Skip to content

Commit

Permalink
Add support for Qt 6's ARM64 qmake.bat
Browse files Browse the repository at this point in the history
  • Loading branch information
cgutman committed Nov 22, 2022
1 parent 89cbbfc commit 92670cc
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions scripts/build-arch.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 92670cc

Please sign in to comment.