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>).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4498 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py
index 6b4f007ce614839c158ed84f317fc07beb43f457..f1308069169967bd7032a58b5ca82f49d98ad824 100644 (file)
--- 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 e28a87f7fa75ca5b707a1334568d9c496484f3e6..106aed9e5d5c1a3d4984181a1152072d47bb9d99 100644 (file)
--- 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')