diff options
| author | Matt Turner <[email protected]> | 2012-01-28 20:13:51 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-30 21:09:25 -0500 |
| commit | 4ff8fd93e8e91672bb02543ecaa0c6e462a87551 (patch) | |
| tree | ed4e93f110d53aad070decb8c5bd00690bddb4b1 /src/glsl/SConscript | |
| parent | 275ac7e5c1fd6c1847a428192fe259e50690fced (diff) | |
glsl: rename Makefile.sources' _SOURCES variables
automake uses variables named *_SOURCES.
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Eric Anholt <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl/SConscript')
| -rw-r--r-- | src/glsl/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index b8154d6083c..f8e872368c2 100644 --- a/src/glsl/SConscript +++ b/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 |