summaryrefslogtreecommitdiff
path: root/xenia-build
diff options
context:
space:
mode:
authorgibbed <rick@gibbed.us>2019-08-17 08:29:47 -0500
committerRick Gibbed <rick@gibbed.us>2019-08-17 08:32:20 -0500
commitc19dc9c7d6589a6cd5295be7ab80fd1df3667196 (patch)
tree52342aa900caf2b82c4e49a6738a8c1d6440572f /xenia-build
parent1ebc13df94c055211630b77e5097fd907d0b3082 (diff)
Prefer vsdevcmd over vcvarsall.
Diffstat (limited to 'xenia-build')
-rwxr-xr-xxenia-build10
1 files changed, 5 insertions, 5 deletions
diff --git a/xenia-build b/xenia-build
index ccb987860..1cf41601b 100755
--- a/xenia-build
+++ b/xenia-build
@@ -110,12 +110,12 @@ def import_vs_environment():
vcvars_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat')
env_tool_args = [vcvars_path, 'x64', '&&', 'set']
else:
- vcvars_path = os.path.join(install_path, 'VC\\Auxiliary\\Build\\vcvarsall.bat')
- 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')
+ vsdevcmd_path = os.path.join(install_path, 'Common7\\Tools\\VsDevCmd.bat')
+ if os.path.isfile(vsdevcmd_path) and os.access(vsdevcmd_path, os.X_OK):
env_tool_args = [vsdevcmd_path, '-arch=amd64', '-host_arch=amd64', '&&', 'set']
+ else:
+ vcvars_path = os.path.join(install_path, 'VC\\Auxiliary\\Build\\vcvarsall.bat')
+ env_tool_args = [vcvars_path, 'x64', '&&', 'set']
if version == 0:
return None