Merge branch 'Margen67-xenia-build-fixes'

This commit is contained in:
Dr. Chat 2019-06-30 17:07:26 -05:00
commit 3238fae758
1 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,7 @@ def main():
if vs_version is None: if vs_version is None:
print('ERROR: Visual Studio not found!') print('ERROR: Visual Studio not found!')
print('Please refer to the building guide:') print('Please refer to the building guide:')
print('https://github.com/benvanik/xenia/blob/master/docs/building.md') print('https://github.com/xenia-project/xenia/blob/master/docs/building.md')
sys.exit(1) sys.exit(1)
# Setup main argument parser and common arguments. # Setup main argument parser and common arguments.
@ -96,7 +96,7 @@ def import_vs_environment():
install_path = None install_path = None
env_tool_args = None env_tool_args = None
vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json -utf8', shell=False, universal_newlines=True) vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -prerelease -format json -utf8', shell=False, universal_newlines=True)
if vswhere: if vswhere:
vswhere = json.loads(vswhere) vswhere = json.loads(vswhere)
if vswhere and len(vswhere) > 0: if vswhere and len(vswhere) > 0: