summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-02-11 17:38:54 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-02-11 20:09:26 +0000
commit982609f4cf2afc4e0afd450aa24907986bca41ab (patch)
tree93babf6ada7e9cc085a9f89bc5cb7368834a59b3 /SConstruct
parentae760279f142244590c8aa76e3139529ca42952f (diff)
downloadexternal_mesa3d-982609f4cf2afc4e0afd450aa24907986bca41ab.zip
external_mesa3d-982609f4cf2afc4e0afd450aa24907986bca41ab.tar.gz
external_mesa3d-982609f4cf2afc4e0afd450aa24907986bca41ab.tar.bz2
scons: builtin_glsl_function on windows needs bundled getopt.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 3908840..19d8b13 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