flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update vcredist to MSVC2015

Browse Source 
refs #615 #616
This commit is contained in:
Roland Winklmeier
2016-04-02 15:24:13 +02:00
parent 675255acf6
commit ef8a0cc0c4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.pri
View File

@@ -68,12 +68,12 @@ INSTALLS += dbus_target dbus_config_target
############### Install VC runtime ##############
win32-msvc2013 {
win32-msvc2015 {
equals(WORD_SIZE,64) {
vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x64.exe
vc_redist_target.files *= $$(VS140COMNTOOLS)../../VC/redist/1033/vcredist_x64.exe
}
equals(WORD_SIZE,32) {
vc_redist_target.files *= $$(VS120COMNTOOLS)../../VC/redist/1033/vcredist_x86.exe
vc_redist_target.files *= $$(VS140COMNTOOLS)../../VC/redist/1033/vcredist_x86.exe
}
vc_redist_target.path *= $${PREFIX}/vcredist
INSTALLS += vc_redist_target

24
installer/installbuilder/vcredist.xml
View File

@@ -6,42 +6,42 @@
<show>1</show>
<folderList>
<folder>
<description>bin</description>
<description>vcredist</description>
<destination>${installdir}/vcredist</destination>
<name>share_windows</name>
<name>vcredist</name>
<platforms>windows</platforms>
<actionList>
<runProgram>
<program>${installdir}/vcredist_x86.exe</program>
<program>${installdir}/vcredist/vcredist_x86.exe</program>
<programArguments>/install /quiet /norestart</programArguments>
<progressText>Installing VC++ 2013 runtime</progressText>
<progressText>Installing VC++ 2015 32 Bit Runtime</progressText>
<ruleList>
<registryTest>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86</key>
<logic>exists</logic>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86</key>
<logic>does_not_exist</logic>
<name>Installed</name>
<type>REG_DWORD</type>
<wowMode>32</wowMode>
</registryTest>
<fileExists>
<path>${installdir}/vcredist_x86.exe</path>
<path>${installdir}/vcredist/vcredist_x86.exe</path>
</fileExists>
</ruleList>
</runProgram>
<runProgram>
<program>${installdir}/vcredist_x64.exe</program>
<program>${installdir}/vcredist/vcredist_x64.exe</program>
<programArguments>/install /quiet /norestart</programArguments>
<progressText>Installing VC++ 2013 runtime</progressText>
<progressText>Installing VC++ 2015 64 Bit Runtime</progressText>
<ruleList>
<registryTest>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x64</key>
<logic>exists</logic>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64</key>
<logic>does_not_exist</logic>
<name>Installed</name>
<type>REG_DWORD</type>
<wowMode>64</wowMode>
</registryTest>
<fileExists>
<path>${installdir}/vcredist_x64.exe</path>
<path>${installdir}/vcredist/vcredist_x64.exe</path>
</fileExists>
</ruleList>
</runProgram>