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 <andreas.boll.dev@gmail.com>
Tested-on-Android-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f5006ab03f62e69c318acfccd3fe29056f9dcb66..f088e67cbe8b84d1e91be59c9cc7f9ed0c9ff87d 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -58,7 +58,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
        $(LIBGLSL_FILES) \
-       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
+       $(BUILTIN_COMPILER_CXX_FILES) \
        $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 7955d34550b77c8ae77765a1d9de6427920f1df0..de63c3246706e8f6dfb49b3294bfce551e3a099a 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -100,7 +100,7 @@ GLSL_COMPILER_CXX_FILES = \
 # builtin_stubs.cpp, is used.
 
 BUILTIN_COMPILER_CXX_FILES = \
-       $(GLSL_SRCDIR)/builtin_stubs.cpp
+       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp
 
 BUILTIN_COMPILER_GENERATED_CXX_FILES = \
        $(GLSL_BUILDDIR)/glsl_lexer.cpp \

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 6abba2a240f662fdcd1e21f86be454c38811432b..6981f041b39f0f687591c37f6e2ca2f81030082e 100644 (file)
--- 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