diff --git a/appveyor.yml b/appveyor.yml
index ee6f0a07..a6254528 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,10 +5,10 @@ clone_depth: 1
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- QTDIR: C:\Qt\5.15
- QTDIR_ARM64: C:\Qt\6.7
+ QTDIR: C:\Qt\6.7
- APPVEYOR_BUILD_WORKER_IMAGE: macOS-Sonoma
BUILD_TARGET: macos
+ QTDIR: $HOME/Qt/6.6
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604
BUILD_TARGET: steamlink
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
@@ -16,9 +16,9 @@ environment:
FFMPEG_CONFIGURE_ARGS: --enable-pic --disable-static --enable-shared --disable-all --enable-avcodec --enable-avformat --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_ARM64%\msvc2019_arm64\bin\'
- - cmd: 'copy /y scripts\appveyor\qtpaths.bat %QTDIR_ARM64%\msvc2019_arm64\bin\'
- - cmd: 'copy /y scripts\appveyor\target_qt.conf %QTDIR_ARM64%\msvc2019_arm64\bin\'
+ - 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\'
- 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'
@@ -48,19 +48,15 @@ before_build:
build_script:
- cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_64\bin'
- cmd: 'scripts\build-arch.bat Release'
- - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019\bin'
- - cmd: 'scripts\build-arch.bat Release'
- - cmd: 'set PATH=%OLDPATH%;%QTDIR_ARM64%\msvc2019_arm64\bin'
+ - cmd: 'set PATH=%OLDPATH%;%QTDIR%\msvc2019_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'
- sh: '[ "$BUILD_TARGET" != linux ] || PATH=$PATH:$HOME/bin scripts/build-appimage.sh'
- - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$HOME/Qt/6.6/macos/bin scripts/generate-dmg.sh Release'
+ - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$QTDIR/macos/bin scripts/generate-dmg.sh Release'
- sh: '[ "$BUILD_TARGET" != steamlink ] || STEAMLINK_SDK_PATH=$HOME/steamlink-sdk scripts/build-steamlink-app.sh'
after_build:
- - cmd: 'appveyor PushArtifact build\installer-x86-Release\MoonlightPortable-x86-%VERSION%.zip -FileName MoonlightPortable-x86-r%APPVEYOR_BUILD_NUMBER%.zip'
- - cmd: 'appveyor PushArtifact build\symbols-x86-Release\MoonlightDebuggingSymbols-x86-%VERSION%.zip -FileName MoonlightDebuggingSymbols-x86-r%APPVEYOR_BUILD_NUMBER%.zip'
- cmd: 'appveyor PushArtifact build\installer-x64-Release\MoonlightPortable-x64-%VERSION%.zip -FileName MoonlightPortable-x64-r%APPVEYOR_BUILD_NUMBER%.zip'
- cmd: 'appveyor PushArtifact build\symbols-x64-Release\MoonlightDebuggingSymbols-x64-%VERSION%.zip -FileName MoonlightDebuggingSymbols-x64-r%APPVEYOR_BUILD_NUMBER%.zip'
- cmd: 'appveyor PushArtifact build\installer-arm64-Release\MoonlightPortable-arm64-%VERSION%.zip -FileName MoonlightPortable-arm64-r%APPVEYOR_BUILD_NUMBER%.zip'
diff --git a/libs b/libs
index 76d8d4fc..1b32bfe0 160000
--- a/libs
+++ b/libs
@@ -1 +1 @@
-Subproject commit 76d8d4fc9c511e5ac36b183ae8c836b4db2fe475
+Subproject commit 1b32bfe0a79ef999e6dec832f765c7a7904a731c
diff --git a/scripts/generate-bundle.bat b/scripts/generate-bundle.bat
index d889e865..185fdb16 100644
--- a/scripts/generate-bundle.bat
+++ b/scripts/generate-bundle.bat
@@ -41,11 +41,6 @@ set INSTALLER_FOLDER=%BUILD_ROOT%\installer-%BUILD_CONFIG%
set /p VERSION=<%SOURCE_ROOT%\app\version.txt
rem Ensure that all architectures have been built before the final bundle
-if not exist "%BUILD_ROOT%\build-x86-%BUILD_CONFIG%\Moonlight.msi" (
- echo Unable to build bundle - missing binaries for %BUILD_CONFIG% x86
- echo You must run 'build-arch.bat %BUILD_CONFIG% x86' first
- exit /b 1
-)
if not exist "%BUILD_ROOT%\build-x64-%BUILD_CONFIG%\Moonlight.msi" (
echo Unable to build bundle - missing binaries for %BUILD_CONFIG% x64
echo You must run 'build-arch.bat %BUILD_CONFIG% x64' first
diff --git a/scripts/update-msvcredist.ps1 b/scripts/update-msvcredist.ps1
index 65e426b3..6a3345eb 100644
--- a/scripts/update-msvcredist.ps1
+++ b/scripts/update-msvcredist.ps1
@@ -1,9 +1,7 @@
-$Urls = [ordered]@{ "X86" = "https://aka.ms/vs/17/release/vc_redist.x86.exe";
- "X64" = "https://aka.ms/vs/17/release/vc_redist.x64.exe";
+$Urls = [ordered]@{ "X64" = "https://aka.ms/vs/17/release/vc_redist.x64.exe";
"ARM64" = "https://aka.ms/vs/17/release/vc_redist.arm64.exe"; }
-$UpgradeCodes = @{ "X86" = "65E5BD06-6392-3027-8C26-853107D3CF1A";
- "X64" = "36F68A90-239C-34DF-B58C-64B30153CE35";
+$UpgradeCodes = @{ "X64" = "36F68A90-239C-34DF-B58C-64B30153CE35";
"ARM64" = "DC9BAE42-810B-423A-9E25-E4073F1C7B00"; }
function Get-RedirectTarget([string]$Url) {
diff --git a/wix/MoonlightSetup/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
index ae24e97f..50c4a8a5 100644
--- a/wix/MoonlightSetup/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -1,9 +1,5 @@
-
-
-
-
@@ -24,7 +20,8 @@
DisableModify="yes"
IconSourceFile="..\..\app\moonlight.ico">
-
+
+
@@ -38,11 +35,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-