fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-15 22:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Fix build breakage caused by c73e6ce

Browse source
This commit is contained in:
Ian Romanick 2011-03-01 15:22:43 -08:00
parent 6b369c4c7c
commit 3158cc7df8
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/Makefile
View file

@ -74,6 +74,12 @@ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@ $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
bison -v -d --output=program/program_parse.tab.c $<
program/lex.yy.c: program/program_lexer.l
flex --never-interactive --outfile=$@ $<
###################################################################### ######################################################################
# Helper libraries used by many drivers: # Helper libraries used by many drivers:

7
src/mesa/program/Makefile
View file

@ -1,7 +0,0 @@
all: program_parse.tab.c lex.yy.c
program_parse.tab.c program_parse.tab.h: program_parse.y
bison -v -d $<
lex.yy.c: program_lexer.l
flex --never-interactive $<

14
src/mesa/sources.mak
View file

@ -234,11 +234,9 @@ STATETRACKER_SOURCES = \
PROGRAM_SOURCES = \ PROGRAM_SOURCES = \
program/arbprogparse.c \ program/arbprogparse.c \
program/hash_table.c \ program/hash_table.c \
program/lex.yy.c \
program/nvfragparse.c \ program/nvfragparse.c \
program/nvvertparse.c \ program/nvvertparse.c \
program/program.c \ program/program.c \
program/program_parse.tab.c \
program/program_parse_extra.c \ program/program_parse_extra.c \
program/prog_cache.c \ program/prog_cache.c \
program/prog_execute.c \ program/prog_execute.c \
@ -254,6 +252,10 @@ PROGRAM_SOURCES = \
program/register_allocate.c \ program/register_allocate.c \
program/symbol_table.c program/symbol_table.c
PROGRAM_GENERATED_SOURCES = \
program/lex.yy.c \
program/program_parse.tab.c
SHADER_CXX_SOURCES = \ SHADER_CXX_SOURCES = \
program/ir_to_mesa.cpp \ program/ir_to_mesa.cpp \
program/sampler.cpp program/sampler.cpp
@ -301,7 +303,7 @@ COMMON_DRIVER_SOURCES = \
# Sources for building non-Gallium drivers # Sources for building non-Gallium drivers
MESA_SOURCES = \ MESA_SOURCES_FOR_DEPEND = \
$(MAIN_SOURCES) \ $(MAIN_SOURCES) \
$(MATH_SOURCES) \ $(MATH_SOURCES) \
$(MATH_XFORM_SOURCES) \ $(MATH_XFORM_SOURCES) \
@ -313,6 +315,10 @@ MESA_SOURCES = \
$(COMMON_DRIVER_SOURCES)\ $(COMMON_DRIVER_SOURCES)\
$(ASM_C_SOURCES) $(ASM_C_SOURCES)
MESA_SOURCES = \
$(MESA_SOURCES_FOR_DEPEND) \
$(PROGRAM_GENERATED_SOURCES)
MESA_CXX_SOURCES = \ MESA_CXX_SOURCES = \
$(SHADER_CXX_SOURCES) $(SHADER_CXX_SOURCES)
@ -331,7 +337,7 @@ MESA_GALLIUM_CXX_SOURCES = \
# All the core C sources, for dependency checking # All the core C sources, for dependency checking
ALL_SOURCES = \ ALL_SOURCES = \
$(MESA_SOURCES) \ $(MESA_SOURCES_FOR_DEPEND) \
$(MESA_CXX_SOURCES) \ $(MESA_CXX_SOURCES) \
$(MESA_ASM_SOURCES) \ $(MESA_ASM_SOURCES) \
$(STATETRACKER_SOURCES) $(STATETRACKER_SOURCES)