diff options
| author | Steven Knight <knight@baldmt.com> | 2009-11-30 13:47:11 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-11-30 13:47:11 (GMT) |
| commit | 3bbb6edb17c8c7133cb15fc3ac7a7d5556daf005 (patch) | |
| tree | 52895e9e2da651f1f63c43d33e07e0fd562591eb | |
| parent | eb66f0847662f27850c390ded65d5e22aec19d0d (diff) | |
| download | SCons-3bbb6edb17c8c7133cb15fc3ac7a7d5556daf005.zip SCons-3bbb6edb17c8c7133cb15fc3ac7a7d5556daf005.tar.gz SCons-3bbb6edb17c8c7133cb15fc3ac7a7d5556daf005.tar.bz2 | |
Explicitly initialize the environment tools=['mssdk', 'msvc', 'mslink']
to get the path to the SDK include directory (so our test program can
#include <windows.h>).
| -rw-r--r-- | test/MSVC/hierarchical.py | 4 | ||||
| -rw-r--r-- | test/MSVC/msvc.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py index 6b4f007..f130806 100644 --- a/test/MSVC/hierarchical.py +++ b/test/MSVC/hierarchical.py @@ -49,7 +49,9 @@ SConscript('build/SConscript') test.write('src/SConscript',""" import os -env = Environment() +# TODO: this is order-dependent (putting 'mssdk' second or third breaks), +# and ideally we shouldn't need to specify the tools= list anyway. +env = Environment(tools=['mssdk', 'msvc', 'mslink']) env.Append(CPPPATH=os.environ.get('INCLUDE', ''), LIBPATH=os.environ.get('LIB', '')) env['PCH'] = 'StdAfx.pch' diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py index e28a87f..106aed9 100644 --- a/test/MSVC/msvc.py +++ b/test/MSVC/msvc.py @@ -45,7 +45,9 @@ if sys.platform != 'win32': test.write('SConstruct',""" import os -env = Environment() +# TODO: this is order-dependent (putting 'mssdk' second or third breaks), +# and ideally we shouldn't need to specify the tools= list anyway. +env = Environment(tools=['mssdk', 'msvc', 'mslink']) env.Append(CPPPATH=os.environ.get('INCLUDE', ''), LIBPATH=os.environ.get('LIB', ''), CCFLAGS='/DPCHDEF') |