summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2011-03-04 14:29:06 +0000
committerJosé Fonseca <[email protected]>2011-03-04 14:44:39 +0000
commitc8e904e159e6ddfe68fa5dc4de72b12eb7b7747d (patch)
tree4e65b6d38e6e46c672142f5da2a4e102632695e2
parentba48811fa8cbe80c67cdbbb9b8180aaf64433c4e (diff)
scons: Unbreak mingw cross compilation.
-rw-r--r--src/glsl/SConscript19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index ef10ca9751e..9ecc155c9c9 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -102,16 +102,16 @@ if env['msvc']:
env.Prepend(CPPPATH = ['#/src/getopt'])
env.PrependUnique(LIBS = [getopt])
-main_obj = env.StaticObject('main.cpp')
-
-mesa_objs = env.StaticObject([
- '#src/mesa/program/hash_table.c',
- '#src/mesa/program/symbol_table.c',
-])
-
if env['crosscompile'] and env['platform'] != 'embedded':
Import('builtin_glsl_function')
else:
+ main_obj = env.StaticObject('main.cpp')
+
+ mesa_objs = env.StaticObject([
+ '#src/mesa/program/hash_table.c',
+ '#src/mesa/program/symbol_table.c',
+ ])
+
builtin_compiler = env.Program(
target = 'builtin_compiler',
source = main_obj + glsl_sources + ['builtin_stubs.cpp'] + mesa_objs,
@@ -149,6 +149,11 @@ env.Depends(glsl, glsl_parser)
Export('glsl')
+# Skip building these programs as they will cause SCons error "Two environments
+# with different actions were specified for the same target"
+if env['crosscompile'] or env['platform'] == 'embedded':
+ Return()
+
env = env.Clone()
if env['platform'] == 'windows':