From 1671f411fcb05ac6912972334fff65c2feca3a47 Mon Sep 17 00:00:00 2001
From: Shane Gannon <sgannon200@gmail.com>
Date: Tue, 11 Mar 2014 19:59:41 +0000
Subject: Adding support for Visual Studio 2013

---
 src/engine/SCons/Tool/MSCommon/vc.py |  5 +++--
 src/engine/SCons/Tool/MSCommon/vs.py | 11 ++++++++++-
 src/engine/SCons/Tool/msvc.xml       |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 6a801ad..68ebbd3 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 88da98a..2ec403b 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 13ce567..793784f 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>,
-- 
cgit v0.12