summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/MSCommon
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2010-08-23 00:22:32 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2010-08-23 00:22:32 (GMT)
commit34a8daeb7d7b6f4dab671934cb4fa774d7470a87 (patch)
tree29f1b36d6e690fae5a38b3f134fc4be8351384e2 /src/engine/SCons/Tool/MSCommon
parentf0239f109337a83b0cef363aff5087fbf824acff (diff)
downloadSCons-34a8daeb7d7b6f4dab671934cb4fa774d7470a87.zip
SCons-34a8daeb7d7b6f4dab671934cb4fa774d7470a87.tar.gz
SCons-34a8daeb7d7b6f4dab671934cb4fa774d7470a87.tar.bz2
bug 2668 - add initial support for vs/vc 2010, and limit vc2010 Express to only generate x86 binaries
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon')
-rw-r--r--src/engine/SCons/Tool/MSCommon/vs.py27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py
index e5a8dca..8254a66 100644
--- a/src/engine/SCons/Tool/MSCommon/vs.py
+++ b/src/engine/SCons/Tool/MSCommon/vs.py
@@ -211,6 +211,33 @@ SupportedVSList = [
# default_dirname='TBD',
#),
+ # Visual Studio 2010
+ # The batch file we look for is in the VC directory,
+ # so the devenv.com executable is up in ..\..\Common7\IDE.
+ VisualStudio('10.0',
+ sdk_version='6.1',
+ hkeys=[r'Microsoft\VisualStudio\10.0\Setup\VS\ProductDir'],
+ common_tools_var='VS100COMNTOOLS',
+ executable_path=r'Common7\IDE\devenv.com',
+ batch_file_path=r'Common7\Tools\vsvars32.bat',
+ default_dirname='Microsoft Visual Studio 10',
+ supported_arch=['x86', 'amd64'],
+ ),
+
+ # Visual C++ 2010 Express Edition
+ # The batch file we look for is in the VC directory,
+ # so the VCExpress.exe executable is up in ..\..\Common7\IDE.
+ VisualStudio('10.0Exp',
+ vc_version='10.0',
+ sdk_version='6.1',
+ hkeys=[r'Microsoft\VCExpress\10.0\Setup\VS\ProductDir'],
+ common_tools_var='VS100COMNTOOLS',
+ executable_path=r'Common7\IDE\VCExpress.exe',
+ batch_file_path=r'Common7\Tools\vsvars32.bat',
+ default_dirname='Microsoft Visual Studio 10',
+ supported_arch=['x86'],
+ ),
+
# Visual Studio 2008
# The batch file we look for is in the VC directory,
# so the devenv.com executable is up in ..\..\Common7\IDE.