From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Mon, 30 Nov 2009 13:47:11 +0000 (+0000)
Subject: Explicitly initialize the environment tools=['mssdk', 'msvc', 'mslink']
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82946d58e0d8035c1e0013409d938fa395385820;p=scons.git

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 6b4f007c..f1308069 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 e28a87f7..106aed9e 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')