pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
Martin Rotter 2025-02-07 10:50:04 +01:00
parent fe9bb4a5ad
commit 746e9affd2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/scripts/github-actions/build-windows.ps1
View file

@ -37,12 +37,14 @@ $ProgressPreference = 'SilentlyContinue'
# Get and prepare needed dependencies. # Get and prepare needed dependencies.
if ($use_qt5 -eq "ON") { if ($use_qt5 -eq "ON") {
$qt_version = "5.15.2" $qt_version = "5.15.2"
$qt_arch_base = "msvc2019_64"
$use_libmpv = "OFF" $use_libmpv = "OFF"
$use_qtmultimedia = "ON" $use_qtmultimedia = "ON"
} }
else { else {
$qt_version = "6.8.2" $qt_version = "6.8.2"
$qt_arch_base = "msvc2022_64"
if ($use_webengine -eq "ON") { if ($use_webengine -eq "ON") {
$use_libmpv = "ON" $use_libmpv = "ON"
@ -55,6 +57,7 @@ else {
} }
$is_qt_6 = $qt_version.StartsWith("6") $is_qt_6 = $qt_version.StartsWith("6")
$qt_arch = "win64_" + $qt_arch_base
$maria_version = "11.4.5" $maria_version = "11.4.5"
$maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip"
@ -103,16 +106,16 @@ pip3 install -U pip
pip3 install -I aqtinstall pip3 install -I aqtinstall
if ($is_qt_6) { if ($is_qt_6) {
aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2022_64 -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine qtimageformats qtmultimedia qt5compat qtwebchannel qtpositioning
} }
else { else {
aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version win64_msvc2019_64 -m qtwebengine aqt -c 'aqt\settings.ini' install-qt -O "$qt_path" windows desktop $qt_version $qt_arch -m qtwebengine
} }
aqt -c 'aqt\settings.ini' install-src -O "$qt_path" windows desktop $qt_version --archives qtbase aqt -c 'aqt\settings.ini' install-src -O "$qt_path" windows desktop $qt_version --archives qtbase
$qt_qmake = "$qt_path\$qt_version\msvc2019_64\bin\qmake.exe" $qt_qmake = "$qt_path\$qt_version\$qt_arch_base\bin\qmake.exe"
$env:PATH = "$qt_path\$qt_version\msvc2019_64\bin\;" + $env:PATH $env:PATH = "$qt_path\$qt_version\$qt_arch_base\bin\;" + $env:PATH
if ($is_qt_6) { if ($is_qt_6) {
# Download openssl 3.x. # Download openssl 3.x.