From 82946d58e0d8035c1e0013409d938fa395385820 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 30 Nov 2009 13:47:11 +0000 Subject: [PATCH] Explicitly initialize the environment tools=['mssdk', 'msvc', 'mslink'] to get the path to the SDK include directory (so our test program can #include ). git-svn-id: http://scons.tigris.org/svn/scons/trunk@4498 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/MSVC/hierarchical.py | 4 +++- 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 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') -- 2.26.2