Index: pylib/gyp/MSVSVersion.py |
diff --git a/pylib/gyp/MSVSVersion.py b/pylib/gyp/MSVSVersion.py |
index 6f19cfca4c0e0b7a37891fe3d34e5280f5b550f2..92e583fd6e27c75406b9c2d197d3ad73b72cb66f 100644 |
--- a/pylib/gyp/MSVSVersion.py |
+++ b/pylib/gyp/MSVSVersion.py |
@@ -225,6 +225,15 @@ def _CreateVersion(name, path, sdk_based=False): |
if path: |
path = os.path.normpath(path) |
versions = { |
+ '2015': VisualStudioVersion('2015', |
+ 'Visual Studio 2015', |
+ solution_version='12.00', |
+ project_version='14.0', |
+ flat_sln=False, |
+ uses_vcxproj=True, |
+ path=path, |
+ sdk_based=sdk_based, |
+ default_toolset='v140'), |
'2013': VisualStudioVersion('2013', |
'Visual Studio 2013', |
solution_version='13.00', |
@@ -334,7 +343,8 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
2008(e) - Visual Studio 2008 (9) |
2010(e) - Visual Studio 2010 (10) |
2012(e) - Visual Studio 2012 (11) |
- 2013(e) - Visual Studio 2013 (11) |
+ 2013(e) - Visual Studio 2013 (12) |
+ 2015 - Visual Studio 2015 (14) |
Where (e) is e for express editions of MSVS and blank otherwise. |
""" |
version_to_year = { |
@@ -343,6 +353,7 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
'10.0': '2010', |
'11.0': '2012', |
'12.0': '2013', |
+ '14.0': '2015', |
} |
versions = [] |
for version in versions_to_check: |
@@ -379,8 +390,9 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
if not path: |
continue |
path = _ConvertToCygpath(path) |
- versions.append(_CreateVersion(version_to_year[version] + 'e', |
- os.path.join(path, '..'), sdk_based=True)) |
+ if version != '14.0': # There is no Express edition for 2015. |
+ versions.append(_CreateVersion(version_to_year[version] + 'e', |
+ os.path.join(path, '..'), sdk_based=True)) |
return versions |
@@ -397,7 +409,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True): |
if version == 'auto': |
version = os.environ.get('GYP_MSVS_VERSION', 'auto') |
version_map = { |
- 'auto': ('12.0', '10.0', '9.0', '8.0', '11.0'), |
+ 'auto': ('14.0', '12.0', '10.0', '9.0', '8.0', '11.0'), |
'2005': ('8.0',), |
'2005e': ('8.0',), |
'2008': ('9.0',), |
@@ -408,6 +420,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True): |
'2012e': ('11.0',), |
'2013': ('12.0',), |
'2013e': ('12.0',), |
+ '2015': ('14.0',), |
} |
override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH') |
if override_path: |