fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler: move build definition of pp_standalone_scaffolding.c

Browse source 
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>
This commit is contained in:
Timothy Arceri 2019-11-21 11:18:54 +11:00
parent 5934a53bfe
commit cd6322366d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/Makefile.sources
View file

@ -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 \

2
src/compiler/SConscript.glsl
View file

@ -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])