diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:43:59 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:43:59 +0200 |
| commit | ce4614c8b5d138be5ec0b9f24dc8dd3296dd2af4 (patch) | |
| tree | 5473294fb67614b735911f0a6ba90346c7beb923 /engine/SCons/Tool/MSCommon/vs.py | |
| parent | f46f0f9e847e1f1002ea96aa2467de11e9754fa2 (diff) | |
| parent | daa63b77a7e2963e59a238e0dca7ceffce91ee99 (diff) | |
Merge tag 'upstream/2.3.6'
Upstream version 2.3.6
Diffstat (limited to 'engine/SCons/Tool/MSCommon/vs.py')
| -rw-r--r-- | engine/SCons/Tool/MSCommon/vs.py | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/engine/SCons/Tool/MSCommon/vs.py b/engine/SCons/Tool/MSCommon/vs.py index ccb332c..d122ec6 100644 --- a/engine/SCons/Tool/MSCommon/vs.py +++ b/engine/SCons/Tool/MSCommon/vs.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" __doc__ = """Module to detect Visual Studio and/or Visual C/C++ """ @@ -203,6 +203,28 @@ class VisualStudio(object): # Tool/MSCommon/vc.py, and the MSVC_VERSION documentation in Tool/msvc.xml. SupportedVSList = [ + # Visual Studio 2015 + VisualStudio('14.0', + vc_version='14.0', + sdk_version='10.0A', + hkeys=[r'Microsoft\VisualStudio\14.0\Setup\VS\ProductDir'], + common_tools_var='VS140COMNTOOLS', + executable_path=r'Common7\IDE\devenv.com', + batch_file_path=r'Common7\Tools\vsvars32.bat', + supported_arch=['x86', 'amd64', "arm"], + ), + + # Visual C++ 2015 Express Edition (for Desktop) + VisualStudio('14.0Exp', + vc_version='14.0', + sdk_version='10.0A', + hkeys=[r'Microsoft\VisualStudio\14.0\Setup\VS\ProductDir'], + common_tools_var='VS140COMNTOOLS', + executable_path=r'Common7\IDE\WDExpress.exe', + batch_file_path=r'Common7\Tools\vsvars32.bat', + supported_arch=['x86', 'amd64', "arm"], + ), + # Visual Studio 2013 VisualStudio('12.0', vc_version='12.0', |