Skip to content

Commit

Permalink
Fix MSVC builds / update to Qt 5.9.9 (patched)
Browse files Browse the repository at this point in the history
  • Loading branch information
vpereverzev committed Aug 5, 2020
1 parent 884dbcf commit 6261bc1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ clone_folder: C:\MuseScore
# set clone depth
clone_depth: 50 # clone entire repository history if not defined

image: Previous Visual Studio 2019
image: Visual Studio 2019

branches:
only:
Expand All @@ -14,8 +14,8 @@ branches:
# build cache to preserve files/folders between builds
cache:
- dependencies.7z
- qt598_msvc2017_64.7z # if not using AppVeyor's built-in Qt in before_build.bat
- qt598_msvc2015.7z # if not using AppVeyor's built-in Qt in before_build.bat
- qt599_msvc2017_64.7z # if not using AppVeyor's built-in Qt in before_build.bat
- qt599_msvc2015.7z # if not using AppVeyor's built-in Qt in before_build.bat
- C:\Program Files (x86)\Jack
- C:\MuseScore\build.release\thirdparty
- C:\ccache
Expand Down
8 changes: 4 additions & 4 deletions build/appveyor/before_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
IF "%PLATFORM%" == "x64" (
SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt598_msvc2017_64.7z"
SET "QTDIR=%cd%\qt\msvc2017_64" & :: uncomment to use our Qt
SET "QTCACHE=qt598_msvc2017_64.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt
:: SET "QTDIR=C:\Qt\5.12.4\msvc2017_64" & :: uncomment to use AppVeyor's Qt
SET "QTCACHE=qt599_msvc2017_64.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt
:: SET "QTDIR=C:\Qt\5.12.9\msvc2017_64" & :: uncomment to use AppVeyor's Qt
SET "TARGET_PROCESSOR_BITS=64"
SET "TARGET_PROCESSOR_ARCH=x86_64"
) ELSE (
SET "QTURL=https://utils.musescore.org.s3.amazonaws.com/qt598_msvc2015.7z"
SET "QTDIR=%cd%\qt\msvc2015" & :: uncomment to use our Qt
SET "QTCACHE=qt598_msvc2015.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt
:: SET "QTDIR=C:\Qt\5.12.4\msvc2017" & :: uncomment to use AppVeyor's Qt
SET "QTCACHE=qt599_msvc2015.7z" & :: bump version here and .appveyor.yml to trigger cache rebuild when upgrading Qt
:: SET "QTDIR=C:\Qt\5.12.9\msvc2017" & :: uncomment to use AppVeyor's Qt
SET "TARGET_PROCESSOR_BITS=32"
SET "TARGET_PROCESSOR_ARCH=x86"
)
Expand Down

0 comments on commit 6261bc1

Please sign in to comment.