ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use vcvarsall in Xenia build script when available, VcDevCmd otherwise.

This commit is contained in:
gibbed 2019-04-18 10:56:27 -05:00
parent b594f97027
commit 3d56d6c46c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xenia-build
View File

@ -110,8 +110,12 @@ def import_vs_environment():
vcvars_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat') vcvars_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat')
env_tool_args = [vcvars_path, 'x64', '&&', 'set'] env_tool_args = [vcvars_path, 'x64', '&&', 'set']
else: else:
vsdevcmd_path = os.path.join(install_path, 'Common7\\Tools\\VsDevCmd.bat') vcvars_path = os.path.join(install_path, 'VC\\Auxiliary\\Build\\vcvarsall.bat')
env_tool_args = [vsdevcmd_path, '-arch=amd64', '-host_arch=amd64'] if os.path.isfile(vcvars_path) and os.access(vcvars_path, os.X_OK):
env_tool_args = [vcvars_path, 'x64', '&&', 'set']
else:
vsdevcmd_path = os.path.join(install_path, 'Common7\\Tools\\VsDevCmd.bat')
env_tool_args = [vsdevcmd_path, '-arch=amd64', '-host_arch=amd64']
if version == 0: if version == 0:
return None return None