diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-01 08:27:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-01 08:27:16 +0100 |
| commit | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (patch) | |
| tree | adc5c52beb88c10ecb1df7b33983e901afc7dea0 /mesalib/src/glsl/SConscript | |
| parent | c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc (diff) | |
| download | vcxsrv-58ff764d4111bfaa7360c57bc62dd620fbdce06f.tar.gz vcxsrv-58ff764d4111bfaa7360c57bc62dd620fbdce06f.tar.bz2 vcxsrv-58ff764d4111bfaa7360c57bc62dd620fbdce06f.zip | |
xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012
Diffstat (limited to 'mesalib/src/glsl/SConscript')
| -rw-r--r-- | mesalib/src/glsl/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript index b8154d608..f8e872368 100644 --- a/mesalib/src/glsl/SConscript +++ b/mesalib/src/glsl/SConscript @@ -42,7 +42,7 @@ glsl_sources = [ source_lists = env.ParseSourceList('Makefile.sources') # add non-generated sources -for l in ('LIBGLCPP_SOURCES', 'LIBGLSL_SOURCES', 'LIBGLSL_CXX_SOURCES'): +for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'): glsl_sources += source_lists[l] if env['msvc']: @@ -57,7 +57,7 @@ else: env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) - compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_SOURCES']) + compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) mesa_objs = env.StaticObject([ 'hash_table.c', @@ -69,7 +69,7 @@ else: builtin_compiler = env.Program( target = 'builtin_compiler', source = compiler_objs + glsl_sources + \ - source_lists['BUILTIN_COMPILER_CXX_SOURCES'], + source_lists['BUILTIN_COMPILER_CXX_FILES'], ) # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll |