compiler: move build definition of pp_standalone_scaffolding.c

This should fix android build issues while still allowing scons to
build the standalone compiler.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2129
Reviewed-by: Mark Janes <mark.a.janes@intel.com>

diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index f20cd6e8c4dacc89b79f936fd01b3266ad2f2caa..7b593059834a337fb32c62f5cbe06b29a864c1e1 100644 (file)
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -186,8 +186,7 @@ LIBGLSL_GENERATED_FILES = \
 
 LIBGLCPP_FILES = \
        glsl/glcpp/glcpp.h \
-       glsl/glcpp/pp.c \
-       glsl/glcpp/pp_standalone_scaffolding.c
+       glsl/glcpp/pp.c
 
 LIBGLCPP_GENERATED_FILES = \
        glsl/glcpp/glcpp-lex.c \

diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index 45ddde8efc924b68c7ec614ed853934b0b94ae5d..7de4ff8c45aa3e4d91f31722d9a2b5428f51f9eb 100644 (file)
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -63,6 +63,8 @@ source_lists = env.ParseSourceList('Makefile.sources')
 for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
     glsl_sources += source_lists[l]
 
+glsl_sources += env.StaticObject("glsl/glcpp/pp_standalone_scaffolding.c")
+
 if env['msvc']:
     env.Prepend(CPPPATH = ['#/src/getopt'])
     env.PrependUnique(LIBS = [getopt])