From cd6322366df3a910ca66b47e4383ca46825e5539 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 21 Nov 2019 11:18:54 +1100 Subject: [PATCH] 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 --- src/compiler/Makefile.sources | 3 +-- src/compiler/SConscript.glsl | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index f20cd6e8c4d..7b593059834 100644 --- 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 45ddde8efc9..7de4ff8c45a 100644 --- 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]) -- 2.30.2