Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2025-03-04 22:57:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch to Qt 6.5 for Windows ARM64 build

Browse source
This commit is contained in:
Cameron Gutman 2023-09-10 18:43:51 -05:00
parent 6f4db913aa
commit 85b5845ebb
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -6,7 +6,7 @@ environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
QTDIR: C:\Qt\5.15 QTDIR: C:\Qt\5.15
QTDIR_ARM64: C:\Qt\6.4.3 QTDIR_ARM64: C:\Qt\6.5
- APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey - APPVEYOR_BUILD_WORKER_IMAGE: macOS-Monterey
BUILD_TARGET: macos BUILD_TARGET: macos
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604

19
scripts/appveyor/target_qt.conf
View file

@ -1,7 +1,20 @@
[DevicePaths] [DevicePaths]
Prefix=C:/Qt/Qt-6.4.3 Prefix=C:/Qt/Qt-6.5
[Paths] [Paths]
Prefix=../ Prefix=../
Documentation=./doc
Headers=include
Libraries=lib
LibraryExecutables=./bin
Binaries=bin
Plugins=./plugins
QmlImports=./qml
ArchData=.
Data=.
Translations=./translations
Examples=examples
Tests=tests
Settings=etc/xdg
HostPrefix=../../msvc2019_64 HostPrefix=../../msvc2019_64
HostBinaries=bin HostBinaries=bin
HostLibraries=lib HostLibraries=lib
@ -11,5 +24,5 @@ Sysroot=
SysrootifyPrefix=false SysrootifyPrefix=false
TargetSpec=win32-arm64-msvc TargetSpec=win32-arm64-msvc
HostSpec= HostSpec=
Documentation=../../Docs/Qt-6.4.3 Documentation=../../Docs/Qt-6.5
Examples=../../Examples/Qt-6.4.3 Examples=../../Examples/Qt-6.5

20
scripts/build-arch.bat
View file

@ -192,8 +192,16 @@ echo Copying qt.conf
copy %SOURCE_ROOT%\app\qt.conf %DEPLOY_FOLDER% copy %SOURCE_ROOT%\app\qt.conf %DEPLOY_FOLDER%
if !ERRORLEVEL! NEQ 0 goto Error if !ERRORLEVEL! NEQ 0 goto Error
if not x%QT_PATH:\5.=%==x%QT_PATH% (
rem Qt 5.15
set WINDEPLOYQT_ARGS=--no-qmltooling --no-virtualkeyboard
) else (
rem Qt 6.5
set WINDEPLOYQT_ARGS=--no-system-d3d-compiler --skip-plugin-types qmltooling,generic
)
echo Deploying Qt dependencies echo Deploying Qt dependencies
%WINDEPLOYQT_CMD% --dir %DEPLOY_FOLDER% --%BUILD_CONFIG% --qmldir %SOURCE_ROOT%\app\gui --no-opengl-sw --no-compiler-runtime --no-qmltooling --no-virtualkeyboard --no-sql %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %WINDEPLOYQT_CMD% --dir %DEPLOY_FOLDER% --%BUILD_CONFIG% --qmldir %SOURCE_ROOT%\app\gui --no-opengl-sw --no-compiler-runtime --no-sql %WINDEPLOYQT_ARGS% %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe
if !ERRORLEVEL! NEQ 0 goto Error if !ERRORLEVEL! NEQ 0 goto Error
echo Deleting unused styles echo Deleting unused styles
@ -201,10 +209,12 @@ rem Qt 5.x directories
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Fusion rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Fusion
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Imagine rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Imagine
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Universal rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls.2\Universal
rem Qt 6.x directories rem Qt 6.5+ directories
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Fusion rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Fusion
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Imagine rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Imagine
rmdir /s /q %DEPLOY_FOLDER%\QtQuick\Controls\Universal rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Universal
rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\Controls\Windows
rmdir /s /q %DEPLOY_FOLDER%\qml\QtQuick\NativeStyle
if "%SIGN%"=="1" ( if "%SIGN%"=="1" (
echo Signing deployed binaries echo Signing deployed binaries