From 982609f4cf2afc4e0afd450aa24907986bca41ab Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Fri, 11 Feb 2011 17:38:54 +0000 Subject: scons: builtin_glsl_function on windows needs bundled getopt. --- SConstruct | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 3908840086..19d8b13ccc 100644 --- a/SConstruct +++ b/SConstruct @@ -121,8 +121,6 @@ if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'): # for debugging #print env.Dump() -Export('env') - ####################################################################### # Invoke host SConscripts @@ -149,13 +147,18 @@ if env['crosscompile'] and env['platform'] != 'embedded': host_env.Tool('gallium') + host_env['hostonly'] = True + assert host_env['crosscompile'] == False + + Export(env = host_env) + SConscript( - 'src/glsl/SConscript', + 'src/SConscript', variant_dir = host_env['build_dir'], duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html - exports={'env':host_env}, ) +Export('env') ####################################################################### # Invoke SConscripts -- cgit v1.2.3