projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scons: builtin_glsl_function on windows needs bundled getopt.
[mesa.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 3908840086a126984da51b2d7e0b48c8fad19b8c..19d8b13ccc939195d0252e81156d633a598784cd 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-121,8
+121,6
@@
if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'):
# for debugging
#print env.Dump()
# for debugging
#print env.Dump()
-Export('env')
-
#######################################################################
# Invoke host SConscripts
#######################################################################
# Invoke host SConscripts
@@
-149,13
+147,18
@@
if env['crosscompile'] and env['platform'] != 'embedded':
host_env.Tool('gallium')
host_env.Tool('gallium')
+ host_env['hostonly'] = True
+ assert host_env['crosscompile'] == False
+
+ Export(env = host_env)
+
SConscript(
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
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
#######################################################################
# Invoke SConscripts