flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the MSVC 2017 redist version

Browse Source 
MSVC 2017 was updated to v15.7 in Jenkins CI and with it also the redist
version numbers. However, the new version was never updated in the installer
and packaging project.
This commit is contained in:
Roland Winklmeier
2018-08-08 01:46:38 +02:00
committed by Klaus Basan
parent fe4fd31688
commit 9fccc6c70a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.pri
View File

@@ -144,13 +144,13 @@ unix:!macx {
############### Install VC runtime ############## ############### Install VC runtime ##############
win32-msvc* { win32-msvc {
PROGRAM_FILES = $$getenv(programfiles(x86)) PROGRAM_FILES = $$getenv(programfiles(x86))
equals(WORD_SIZE,64) { equals(WORD_SIZE,64) {
vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.11.25325/vcredist_x64.exe) vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.14.26405/vcredist_x64.exe)
} }
equals(WORD_SIZE,32) { equals(WORD_SIZE,32) {
vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.11.25325/vcredist_x86.exe) vc_redist_target.files *= $$shell_path($$PROGRAM_FILES/Microsoft Visual Studio/2017/Community/VC/Redist/MSVC/14.14.26405/vcredist_x86.exe)
} }
vc_redist_target.path *= $${PREFIX}/vcredist vc_redist_target.path *= $${PREFIX}/vcredist
INSTALLS += vc_redist_target INSTALLS += vc_redist_target

4
installer/installbuilder/vcredist.xml
View File

@@ -31,7 +31,7 @@
</fileExists> </fileExists>
<compareVersions> <compareVersions>
<logic>greater</logic> <logic>greater</logic>
<version1>14.11.25325.0</version1> <version1>v14.15.26706.0</version1>
<version2>${vcruntimeversionx86}</version2> <version2>${vcruntimeversionx86}</version2>
</compareVersions> </compareVersions>
</ruleList> </ruleList>
@@ -46,7 +46,7 @@
</fileExists> </fileExists>
<compareVersions> <compareVersions>
<logic>greater</logic> <logic>greater</logic>
<version1>v14.11.25325.0</version1> <version1>v14.15.26706.0</version1>
<version2>${vcruntimeversionx64}</version2> <version2>${vcruntimeversionx64}</version2>
</compareVersions> </compareVersions>
</ruleList> </ruleList>