diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-08-23 00:22:32 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-08-23 00:22:32 (GMT) |
| commit | 34a8daeb7d7b6f4dab671934cb4fa774d7470a87 (patch) | |
| tree | 29f1b36d6e690fae5a38b3f134fc4be8351384e2 | |
| parent | f0239f109337a83b0cef363aff5087fbf824acff (diff) | |
| download | SCons-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
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/RELEASE.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 27 |
3 files changed, 34 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6553d5b..85841de 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -110,6 +110,11 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - Add support for DMD version 2 (the phobos2 library). + From William Deegan: + + - Add initial support for VS/VC 2010 (express and non-express versions) + + RELEASE 2.0.1 - Mon, 15 Aug 2010 15:46:32 -0700 From Dirk Baechle: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 205babe..e8132a8 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -49,6 +49,8 @@ - List modifications to existing features, where the previous behavior wouldn't actually be considered a bug + - Add initial support for VS/VC 2001 + FIXES - CPPDEFINES containing dictionaries now work better. 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. |