Scons: add Visual Studio 2013 support.
authorMartijn Berger <martijn.berger@gmail.com>
Sun, 29 Dec 2013 16:51:13 +0000 (17:51 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 29 Dec 2013 16:52:37 +0000 (17:52 +0100)
scons-local/SCons/Tool/MSCommon/common.py
scons-local/SCons/Tool/MSCommon/vc.py
scons-local/SCons/Tool/MSCommon/vs.py

index e3fda5af1af5d13966e7c478e99d94e93fa23011..aefd787abce62f3c94232880518da5790c206ad8 100644 (file)
@@ -136,6 +136,7 @@ def get_output(vcbat, args = None, env = None):
     # settings in vs.py.
     vars = [
         'COMSPEC',
+        'VS120COMNTOOLS',
         'VS110COMNTOOLS',
         'VS100COMNTOOLS',
         'VS90COMNTOOLS',
index ec285c83b26e6a6f3b147d67647655561f254243..916968d783d530171e5c4be6f0d6b0644027bfeb 100644 (file)
@@ -129,9 +129,11 @@ def get_host_target(env):
 
     return (host, target,req_target_platform)
 
-_VCVER = ["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", "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'],
         '11.0': [
             r'Microsoft\VisualStudio\11.0\Setup\VC\ProductDir'],
         '11.0Exp' : [
index 18b31a0beb51606ed4e46aad246adce2e569f4b0..867fc0d1c34b11f5bf66bc3e8409afd151653083 100644 (file)
@@ -210,7 +210,16 @@ SupportedVSList = [
     #             executable_path=r'TBD',
     #             default_dirname='TBD',
     #),
-
+    VisualStudio('12.0',
+                 sdk_version='6.1',
+                 hkeys=[r'Microsoft\VisualStudio\12.0'],
+                 common_tools_var='VS120COMNTOOLS',
+                 executable_path=r'Common7\IDE\VDExpress.exe',
+                 batch_file_path=r'Common7\Tools\vsvars32.bat',
+                 default_dirname='Microsoft Visual Studio 12',
+                 supported_arch=['x86', 'amd64'],
+    ),
+    
     # Visual Studio 11
     # The batch file we look for is in the VC directory,
     # so the devenv.com executable is up in ..\..\Common7\IDE.