diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
| commit | a5179a42a3376f0d8c1d01456235b044854d8bdc (patch) | |
| tree | 04018368b95d6eb802adbf083fdd774a0336be51 /mesalib/src/glsl/Android.gen.mk | |
| parent | 4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff) | |
| parent | 55c05b8a12944349b00053253d3a49b223a9f4de (diff) | |
| download | vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.gz vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.bz2 vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 20 Sep 2013
Diffstat (limited to 'mesalib/src/glsl/Android.gen.mk')
| -rw-r--r-- | mesalib/src/glsl/Android.gen.mk | 19 |
1 files changed, 0 insertions, 19 deletions
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 $@ |