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 pull request #184 from sephiroth99/update_build_script 

Update build script
This commit is contained in:
Ben Vanik 2015-05-02 10:23:14 -07:00
parent e3220f7ae6 8bdd28aa8c
commit b785a786cd
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xenia-build.py
View File

@ -35,9 +35,9 @@ def main():
# Grab Visual Studio version and execute shell to set up environment. # Grab Visual Studio version and execute shell to set up environment.
if sys.platform == 'win32': if sys.platform == 'win32':
vs_version = import_vs_environment() vs_version = import_vs_environment()
if vs_version != 2013 and vs_version != 2015: if vs_version != 2015:
print('ERROR: Visual Studio 2013 or 2015 not found!') print('ERROR: Visual Studio 2015 not found!')
print('Ensure you have the VS120COMNTOOLS environment variable!') print('Ensure you have the VS140COMNTOOLS environment variable!')
sys.exit(1) sys.exit(1)
return return
@ -71,7 +71,7 @@ def import_vs_environment():
interesting environment variables into os.environ. interesting environment variables into os.environ.
Returns: Returns:
A version such as 2010, 2012, or 2013 or None if no VS is found. A version such as 2015 or None if no VS is found.
""" """
version = 0 version = 0
tools_path = '' tools_path = ''
@ -82,15 +82,6 @@ def import_vs_environment():
# TODO(benvanik): remove preview tools. # TODO(benvanik): remove preview tools.
version = 2015 version = 2015
tools_path = os.environ['VS140COMNTOOLS'] tools_path = os.environ['VS140COMNTOOLS']
elif 'VS120COMNTOOLS' in os.environ:
version = 2013
tools_path = os.environ['VS120COMNTOOLS']
elif 'VS110COMNTOOLS' in os.environ:
version = 2012
tools_path = os.environ['VS110COMNTOOLS']
elif 'VS100COMNTOOLS' in os.environ:
version = 2010
tools_path = os.environ['VS100COMNTOOLS']
if version == 0: if version == 0:
return None return None
tools_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat') tools_path = os.path.join(tools_path, '..\\..\\vc\\vcvarsall.bat')