Commits

Gary Oberbrunner  committed 1fb605e Merge

Merged in shanegannon/scons (pull request #120): Visual Studio 2013 support

  • Participants
  • Parent commits 3977002, 1860037

Comments (0)

Files changed (4)

File src/CHANGES.txt

 
 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.

File src/engine/SCons/Tool/MSCommon/vc.py

 
 # 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': [

File src/engine/SCons/Tool/MSCommon/vs.py

 # 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',

File src/engine/SCons/Tool/msvc.xml

 
 <para>
 Valid values for Windows are
+<literal>12.0</literal>,
 <literal>12.0Exp</literal>,
 <literal>11.0</literal>,
 <literal>11.0Exp</literal>,