diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-05-14 18:43:35 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-05-14 18:43:35 (GMT) |
| commit | c731b8525a85fa04d2402caa08664134399dd527 (patch) | |
| tree | 4ae0d6e4f57193d3b530273530bec2d529952188 | |
| parent | f149e1b159d74e7b6a32cffe8490b8396e57a998 (diff) | |
| parent | 59519c9f09e78f041ec2c1c1c9afe5af4aa1ccbf (diff) | |
| download | SCons-c731b8525a85fa04d2402caa08664134399dd527.zip SCons-c731b8525a85fa04d2402caa08664134399dd527.tar.gz SCons-c731b8525a85fa04d2402caa08664134399dd527.tar.bz2 | |
merge
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/sdk.py | 16 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py index 1845599..43b0272 100644 --- a/src/engine/SCons/Tool/MSCommon/sdk.py +++ b/src/engine/SCons/Tool/MSCommon/sdk.py @@ -164,6 +164,12 @@ SDK70VCSetupScripts = { 'x86' : r'bin\vcvars32.bat', 'x86_ia64' : r'bin\vcvarsx86_ia64.bat', 'ia64' : r'bin\vcvarsia64.bat'} +SDK100VCSetupScripts = {'x86' : r'bin\vcvars32.bat', + 'amd64' : r'bin\vcvars64.bat', + 'x86_amd64': r'bin\x86_amd64\vcvarsx86_amd64.bat', + 'x86_arm' : r'bin\x86_arm\vcvarsx86_arm.bat'} + + # The list of support SDKs which we know how to detect. # # The first SDK found in the list is the one used by default if there @@ -172,6 +178,16 @@ SDK70VCSetupScripts = { 'x86' : r'bin\vcvars32.bat', # # If you update this list, update the documentation in Tool/mssdk.xml. SupportedSDKList = [ + WindowsSDK('10.0', + sanity_check_file=r'bin\SetEnv.Cmd', + include_subdir='include', + lib_subdir={ + 'x86' : ['lib'], + 'x86_64' : [r'lib\x64'], + 'ia64' : [r'lib\ia64'], + }, + vc_setup_scripts = SDK70VCSetupScripts, + ), WindowsSDK('7.1', sanity_check_file=r'bin\SetEnv.Cmd', include_subdir='include', diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 31197ef..cff05d5 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -202,7 +202,7 @@ SupportedVSList = [ # Visual Studio 2015 VisualStudio('14.0', vc_version='14.0', - sdk_version='10.0A', + sdk_version='10.0', hkeys=[r'Microsoft\VisualStudio\14.0\Setup\VS\ProductDir'], common_tools_var='VS140COMNTOOLS', executable_path=r'Common7\IDE\devenv.com', |