[Mesa-dev] [PATCH 05/15] mesa/sources.mak: Change handling of lex and yacc files for Android

Chad Versace chad at chad-versace.us
Thu Aug 4 02:47:14 PDT 2011


The proper way to handle lex and yacc files in Android is to include them
in the list of C and CPP files and let the build system automagically do
the right thing.

Note: This is in preparation for porting i965 to Android.
CC: Chia-I Wu <olv at lunarg.com>,
CC: Chih-Wei Huang <cwhuang at android-x86.org>
Signed-off-by: Chad Versace <chad at chad-versace.us>
---
 src/mesa/sources.mak |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 6800c47..9923133 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -244,11 +244,9 @@ STATETRACKER_SOURCES := \
 PROGRAM_SOURCES := \
 	program/arbprogparse.c \
 	program/hash_table.c \
-	program/lex.yy.c \
 	program/nvfragparse.c \
 	program/nvvertparse.c \
 	program/program.c \
-	program/program_parse.tab.c \
 	program/program_parse_extra.c \
 	program/prog_cache.c \
 	program/prog_execute.c \
@@ -264,6 +262,15 @@ PROGRAM_SOURCES := \
 	program/register_allocate.c \
 	program/symbol_table.c
 
+ifeq ($(ANDROID),)
+	PROGRAM_SOURCES += \
+		program/program_parse.tab.c \
+		program/lex.yy.c
+else
+	PROGRAM_SOURCES += \
+		program/program_parse.y \
+		program/program_lexer.l
+endif # ANDROID
 
 SHADER_CXX_SOURCES := \
 	program/ir_to_mesa.cpp \
-- 
1.7.6



More information about the mesa-dev mailing list