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/vc.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/vc.py')
| -rw-r--r-- | engine/SCons/Tool/MSCommon/vc.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engine/SCons/Tool/MSCommon/vc.py b/engine/SCons/Tool/MSCommon/vc.py index 1127796..0db8a8c 100644 --- a/engine/SCons/Tool/MSCommon/vc.py +++ b/engine/SCons/Tool/MSCommon/vc.py @@ -30,7 +30,7 @@ # * test on 64 bits XP + VS 2005 (and VS 6 if possible) # * SDK # * Assembly -__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" __doc__ = """Module for Visual C/C++ detection and configuration. """ @@ -134,9 +134,13 @@ def get_host_target(env): # If you update this, update SupportedVSList in Tool/MSCommon/vs.py, and the # MSVC_VERSION documentation in Tool/msvc.xml. -_VCVER = ["12.0", "12.0Exp", "11.0", "11.0Exp", "10.0", "10.0Exp", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] +_VCVER = ["14.0", "14.0Exp", "12.0", "12.0Exp", "11.0", "11.0Exp", "10.0", "10.0Exp", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] _VCVER_TO_PRODUCT_DIR = { + '14.0' : [ + r'Microsoft\VisualStudio\14.0\Setup\VC\ProductDir'], + '14.0Exp' : [ + r'Microsoft\VCExpress\14.0\Setup\VC\ProductDir'], '12.0' : [ r'Microsoft\VisualStudio\12.0\Setup\VC\ProductDir'], '12.0Exp' : [ |