diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-12 15:47:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-12 15:47:35 +0000 |
| commit | 026b85e62b3d8812afb5f04df29aeac28c52b331 (patch) | |
| tree | 04f14c936311a1852769eb5005dbaa25bb2dc244 /mesalib/SConstruct | |
| parent | 183968dd18dc91f73325980bd511ed6bdb38b432 (diff) | |
| download | vcxsrv-026b85e62b3d8812afb5f04df29aeac28c52b331.tar.gz vcxsrv-026b85e62b3d8812afb5f04df29aeac28c52b331.tar.bz2 vcxsrv-026b85e62b3d8812afb5f04df29aeac28c52b331.zip | |
xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011
Diffstat (limited to 'mesalib/SConstruct')
| -rw-r--r-- | mesalib/SConstruct | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 2c34fbbf7..269715637 100644 --- a/mesalib/SConstruct +++ b/mesalib/SConstruct @@ -121,8 +121,6 @@ if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'): # for debugging
#print env.Dump()
-Export('env')
-
#######################################################################
# Invoke host SConscripts
@@ -132,7 +130,7 @@ Export('env') #
# Create host environent
-if env['platform'] != common.host_platform:
+if env['crosscompile'] and env['platform'] != 'embedded':
host_env = Environment(
options = opts,
# no tool used
@@ -149,13 +147,21 @@ if env['platform'] != common.host_platform: host_env.Tool('gallium')
+ host_env['hostonly'] = True
+ assert host_env['crosscompile'] == False
+
+ if host_env['msvc']:
+ host_env.Append(CPPPATH = ['#include/c99'])
+
+ 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
|