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

Upgrade to MSVC 2017

Browse Source 
For 32 bit we still use the binary compatible MSVC 2015 prebuilt Qt binaries.
For 64 bit, we change to the MSVC 2017 prebuilt binaries.
Redistributables are in no packaged from MSVC 2017 installs.
This commit is contained in:
Roland Winklmeier
2017-11-16 14:00:48 +01:00
parent e8219efdde
commit ae88a091e6
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/jenkins.py
View File

@@ -244,9 +244,9 @@ class MSVCBuilder(Builder):
os.environ['PATH'] += os.pathsep + self._get_externals_path()
os.environ['PATH'] += os.pathsep + 'C:/Program Files/7-Zip'
if self.word_size == '32':
vs_env = get_vs_env('14.0', 'x86')
vs_env = get_vs_env('VS2017', 'x86')
else:
vs_env = get_vs_env('14.0', 'amd64')
vs_env = get_vs_env('VS2017', 'amd64')
os.environ.update(vs_env)
@@ -257,7 +257,12 @@ class MSVCBuilder(Builder):
return path.abspath(path.join(self._get_qtcreator_path(), 'jom.exe'))
def _get_qt_component(self):
return 'msvc2015'
if self.word_size == '32':
return 'msvc2015'
elif self.word_size == '64':
return 'msvc2017'
else:
raise RuntimeError('Illegal word size!')
def __init__(self, config_file, word_size):
Builder.__init__(self, config_file, word_size)