Fix MSVC binary path in CI for Qt 6.8

This commit is contained in:
Cameron Gutman 2025-01-13 20:11:06 -06:00
parent ffa87c5f01
commit edd7a134d8
4 changed files with 12 additions and 12 deletions

View File

@ -16,9 +16,9 @@ environment:
FFMPEG_CONFIGURE_ARGS: --enable-pic --disable-static --enable-shared --disable-all --enable-avcodec --enable-avformat --enable-swscale --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau --enable-libdrm --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --enable-hwaccel=av1_vulkan --enable-libdav1d --enable-decoder=libdav1d
install:
- cmd: 'copy /y scripts\appveyor\qmake.bat %QTDIR%\msvc2019_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\qtpaths.bat %QTDIR%\msvc2019_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\target_qt.conf %QTDIR%\msvc2019_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\qmake.bat %QTDIR%\msvc2022_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\qtpaths.bat %QTDIR%\msvc2022_arm64\bin\'
- cmd: 'copy /y scripts\appveyor\target_qt.conf %QTDIR%\msvc2022_arm64\bin\'
- sh: '[ "$BUILD_TARGET" != macos ] || nvm use node'
- sh: '[ "$BUILD_TARGET" != macos ] || npm install --global create-dmg'
- sh: '[ "$BUILD_TARGET" != steamlink ] || sudo apt install -y libc6:i386 libstdc++6:i386'
@ -46,9 +46,9 @@ before_build:
- sh: 'export VERSION=`cat app/version.txt`'
build_script:
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_64\bin'
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2022_64\bin'
- cmd: 'scripts\build-arch.bat Release'
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_arm64\bin'
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2022_arm64\bin'
- cmd: 'scripts\build-arch.bat Release'
- cmd: 'scripts\generate-bundle.bat Release'
- sh: '[ "$BUILD_TARGET" != linux ] || source /opt/qt515/bin/qt515-env.sh'

View File

@ -1,2 +1,2 @@
@echo off
%QTDIR%\msvc2019_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %*
%QTDIR%\msvc2022_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %*

View File

@ -1,2 +1,2 @@
@echo off
%QTDIR%\msvc2019_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %*
%QTDIR%\msvc2022_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %*

View File

@ -1,5 +1,5 @@
[DevicePaths]
Prefix=C:/Qt/Qt-6.7
Prefix=C:/Qt/Qt-6.8
[Paths]
Prefix=../
Documentation=./doc
@ -15,14 +15,14 @@ Translations=./translations
Examples=examples
Tests=tests
Settings=etc/xdg
HostPrefix=../../msvc2019_64
HostPrefix=../../msvc2022_64
HostBinaries=bin
HostLibraries=lib
HostLibraryExecutables=./bin
HostData=../msvc2019_arm64
HostData=../msvc2022_arm64
Sysroot=
SysrootifyPrefix=false
TargetSpec=win32-arm64-msvc
HostSpec=
Documentation=../../Docs/Qt-6.7
Examples=../../Examples/Qt-6.7
Documentation=../../Docs/Qt-6.8
Examples=../../Examples/Qt-6.8