diff options
| author | Matt Turner <[email protected]> | 2013-01-17 23:28:42 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-01-22 14:33:41 -0800 |
| commit | 952e6e9f3b0eb179f67345f00e5a7f1dbaa7bdd5 (patch) | |
| tree | 54890d50498cbaf983c49c7e05c42838c5b795ee /src/glsl/SConscript | |
| parent | 2a710543968b6710368d53dbff350d2d23e08268 (diff) | |
glsl/Makefile.sources: Correct BUILTIN_COMPILER_CXX_FILES
Squashed with two reverts:
Revert "android: Update for builtin_stubs.cpp move"
This reverts commit c0def90ede1e939173041b8785303de90f8fdc6c.
Revert "scons: Update for builtin_stubs.cpp"
This reverts commit 8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b.
Tested-by: Andreas Boll <[email protected]>
Tested-on-Android-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/glsl/SConscript')
| -rw-r--r-- | src/glsl/SConscript | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 6abba2a240f..6981f041b39 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -76,9 +76,8 @@ else: builtin_compiler = env.Program( target = 'builtin_compiler/builtin_compiler', - source = compiler_objs + glsl_sources + [ - 'builtin_compiler/builtin_stubs.cpp', - ] + source = compiler_objs + glsl_sources + \ + source_lists['BUILTIN_COMPILER_CXX_FILES'], ) # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll |