diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 15:54:52 -0400 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-03-23 15:54:52 -0400 |
| commit | ac46c2a336ec3c8d85bbd7eab0a213035a9023a6 (patch) | |
| tree | 1e89d053dda790ab37642c0000799f5a70cdf1f9 | |
| parent | e369471896e79f41084a3c8b97bcd5b6231833e4 (diff) | |
| parent | 3e09100f84cad2cf83738dc234e49173cd8fc70c (diff) | |
| download | scons-ac46c2a336ec3c8d85bbd7eab0a213035a9023a6.tar.gz | |
Merged in shanegannon/scons (pull request #120): Visual Studio 2013 support
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 11 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.xml | 1 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ea2bb0c1..372b9e26 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Shane Gannon: + - Support for Visual Studio 2013 (12.0) + From Sye van der Veen: - Support for Visual Studio 12.0Exp, and fixes for earlier MSVS versions. diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 6a801ad1..68ebbd3a 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -134,10 +134,11 @@ 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. -# TODO Visual C 12.0 -_VCVER = ["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 = ["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 = { + '12.0' : [ + r'Microsoft\VisualStudio\12.0\Setup\VC\ProductDir'], '12.0Exp' : [ r'Microsoft\VCExpress\12.0\Setup\VC\ProductDir'], '11.0': [ diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 88da98a0..2ec403b6 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -203,7 +203,16 @@ class VisualStudio(object): # Tool/MSCommon/vc.py, and the MSVC_VERSION documentation in Tool/msvc.xml. SupportedVSList = [ - # TODO Visual Studio 2013 + # Visual Studio 2013 + VisualStudio('12.0', + vc_version='12.0', + sdk_version='8.1A', + hkeys=[r'Microsoft\VisualStudio\12.0\Setup\VS\ProductDir'], + common_tools_var='VS120COMNTOOLS', + executable_path=r'Common7\IDE\devenv.com', + batch_file_path=r'Common7\Tools\vsvars32.bat', + supported_arch=['x86', 'amd64'], + ), # Visual C++ 2013 Express Edition (for Desktop) VisualStudio('12.0Exp', diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index 13ce567f..793784f8 100644 --- a/src/engine/SCons/Tool/msvc.xml +++ b/src/engine/SCons/Tool/msvc.xml @@ -352,6 +352,7 @@ constructor; setting it later has no effect. <para> Valid values for Windows are +<literal>12.0</literal>, <literal>12.0Exp</literal>, <literal>11.0</literal>, <literal>11.0Exp</literal>, |