From 55c05b8a12944349b00053253d3a49b223a9f4de Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Sep 2013 11:47:27 +0200 Subject: fontconfig mesa pixman git update 20 Sep 2013 pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1 mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7 --- mesalib/src/glsl/Android.gen.mk | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'mesalib/src/glsl/Android.gen.mk') diff --git a/mesalib/src/glsl/Android.gen.mk b/mesalib/src/glsl/Android.gen.mk index 2ed9fa64b..7ec56d4f2 100644 --- a/mesalib/src/glsl/Android.gen.mk +++ b/mesalib/src/glsl/Android.gen.mk @@ -35,10 +35,6 @@ sources := \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c -ifneq ($(LOCAL_IS_HOST_MODULE),true) -sources += builtin_function.cpp -endif - LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += $(intermediates) $(intermediates)/glcpp $(MESA_TOP)/src/glsl/glcpp @@ -81,18 +77,3 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y $(call glsl_local-y-to-c-and-h) - -BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX) - -builtin_function_deps := \ - $(LOCAL_PATH)/builtins/tools/generate_builtins.py \ - $(LOCAL_PATH)/builtins/tools/texture_builtins.py \ - $(BUILTIN_COMPILER) \ - $(wildcard $(LOCAL_PATH)/builtins/profiles/*) \ - $(wildcard $(LOCAL_PATH)/builtins/ir/*) - -$(intermediates)/builtin_function.cpp: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/builtins/tools/generate_builtins.py -$(intermediates)/builtin_function.cpp: $(builtin_function_deps) - @mkdir -p $(dir $@) - @echo "Gen GLSL: $(PRIVATE_MODULE) <= $(notdir $@)" - $(hide) $(PRIVATE_SCRIPT) $(BUILTIN_COMPILER) > $@ || rm -f $@ -- cgit v1.2.3