From 3d56d6c46c9f358fbd3d5e4ae932801fa3c1c2a6 Mon Sep 17 00:00:00 2001 From: gibbed Date: Thu, 18 Apr 2019 10:56:27 -0500 Subject: [PATCH] Use vcvarsall in Xenia build script when available, VcDevCmd otherwise. --- xenia-build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xenia-build b/xenia-build index 4409bb2b6..2199c12de 100755 --- a/xenia-build +++ b/xenia-build @@ -110,8 +110,12 @@ def import_vs_environment(): vcvars_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat') 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'] + 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') + env_tool_args = [vsdevcmd_path, '-arch=amd64', '-host_arch=amd64'] if version == 0: return None