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

Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-07-11 09:26:57 +03:00
parent f7ea93148a 3238fae758
commit db44eaf2e4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -53,7 +53,7 @@ environment:
# scripts that run after cloning repository # scripts that run after cloning repository
install: install:
- cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% - cmd: set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
- cmd: xb.bat setup - cmd: xb.bat setup

4
xenia-build
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', 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: