razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Update Windows build to use Qt 5.15 and MSVC 2019

Browse source
This commit is contained in:
manongjohn 2021-09-05 13:34:18 -04:00
parent c1c3b01477
commit 9a9f34e492
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/windows_build.yml vendored
View file

@ -4,7 +4,7 @@ on: [push, pull_request]
jobs:
Windows:
runs-on: windows-2016
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
with:

11
ci-scripts/windows/tahoma-build.bat
View file

@ -10,17 +10,16 @@ IF NOT EXIST build mkdir build
cd build
REM Setup for local builds
set MSVCVERSION="Visual Studio 14 2015"
set BOOST_ROOT=C:\boost\boost_1_61_0
set MSVCVERSION="Visual Studio 16 2019"
set BOOST_ROOT=C:\boost\boost_1_74_0
set OPENCV_DIR=C:\opencv\451\build
set QT_PATH=C:\Qt\5.9.7\msvc2015_64
set QT_PATH=C:\Qt\5.15.2\msvc2019_64
REM These are effective when running from Actions
IF EXIST C:\local\boost_1_74_0 set BOOST_ROOT=C:\local\boost_1_74_0
IF EXIST C:\tools\opencv set OPENCV_DIR=C:\tools\opencv\build
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64 (
set MSVCVERSION="Visual Studio 15 2017"
set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 (
set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
)
set WITH_CANON=N

4
ci-scripts/windows/tahoma-buildpkg.bat
View file

@ -62,10 +62,10 @@ IF EXIST ..\..\thirdparty\apps\rhubarb (
echo ">>> Configuring Tahoma2D.exe for deployment"
REM Setup for local builds
set QT_PATH=C:\Qt\5.9.7\msvc2015_64
set QT_PATH=C:\Qt\5.15.2\msvc2019_64
REM These are effective when running from Actions/Appveyor
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.9\msvc2017_64
IF EXIST D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64 set QT_PATH=D:\a\tahoma2d\tahoma2d\thirdparty\qt\5.15\msvc2019_64
%QT_PATH%\bin\windeployqt.exe Tahoma2D\Tahoma2D.exe

12
ci-scripts/windows/tahoma-install.bat
View file

@ -1,9 +1,9 @@
choco install opencv --version=4.5.1
choco install boost-msvc-14.1
choco install boost-msvc-14.2
REM Install Qt 5.9
curl -fsSL -o Qt5.9.7_msvc2017_64.zip https://github.com/tahoma2d/qt5/releases/download/v5.9.7/Qt5.9.7_msvc2017_64.zip
7z x Qt5.9.7_msvc2017_64.zip
rename Qt5.9.7_msvc2017_64 5.9
REM Install Qt 5.15
curl -fsSL -o Qt5.15.2_msvc2019_64.zip https://github.com/tahoma2d/qt5/releases/download/v5.15.2/Qt5.15.2_msvc2019_64.zip
7z x Qt5.15.2_msvc2019_64.zip
rename Qt5.15.2_msvc2019_64 5.15
mkdir thirdparty\qt
move 5.9 thirdparty\qt
move 5.15 thirdparty\qt