Build with Visual Studio 2017

This commit is contained in:
Cheng Zhao 2018-03-13 14:21:09 +09:00 committed by Aleksei Kuzmin
parent e6d38cb64e
commit 42938de973
4 changed files with 6 additions and 6 deletions

View file

@ -63,9 +63,9 @@ def get_vs_env(vs_version, arch):
"""
Returns the env object for VS building environment.
The vs_version can be strings like "12.0" (e.g. VS2013), the arch has to
The vs_version can be strings like "2017", the arch has to
be one of "x86", "amd64", "arm", "x86_amd64", "x86_arm", "amd64_x86",
"amd64_arm", e.g. the args passed to vcvarsall.bat.
"""
vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio {0}\\VC\\vcvarsall.bat".format(vs_version)
vsvarsall = "C:\\Program Files (x86)\\Microsoft Visual Studio\\{0}\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat".format(vs_version)
return get_environment_from_batch_command([vsvarsall, arch])

View file

@ -246,7 +246,7 @@ def import_vs_env(target_arch):
vs_arch = 'amd64_x86'
else:
vs_arch = 'x86_amd64'
env = get_vs_env('14.0', vs_arch)
env = get_vs_env('2017', vs_arch)
os.environ.update(env)