diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:53:47 +0200 |
| commit | 0130346adbce7e6b2422429887fc46c76806d845 (patch) | |
| tree | 1b88028d42d79ab8062581d361a720b04a87fbc0 /mesalib/src/glsl/Android.gen.mk | |
| parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
| download | vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.gz vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.tar.bz2 vcxsrv-0130346adbce7e6b2422429887fc46c76806d845.zip | |
randrproto mesa pixman git update 4 oct 2012
randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455
mesa: 185d6df3c10a7ff5defe163af614bfc41088910b
pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
Diffstat (limited to 'mesalib/src/glsl/Android.gen.mk')
| -rw-r--r-- | mesalib/src/glsl/Android.gen.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/glsl/Android.gen.mk b/mesalib/src/glsl/Android.gen.mk index e4ccb7291..2ed9fa64b 100644 --- a/mesalib/src/glsl/Android.gen.mk +++ b/mesalib/src/glsl/Android.gen.mk @@ -52,10 +52,10 @@ define local-l-or-ll-to-c-or-cpp $(hide) $(LEX) --nounistd -o$@ $< endef -define local-y-to-c-and-h +define glsl_local-y-to-c-and-h @mkdir -p $(dir $@) @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ $< + $(hide) $(YACC) -o $@ -p "glcpp_parser_" $< endef define local-yy-to-cpp-and-h @@ -80,7 +80,7 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(call local-l-or-ll-to-c-or-cpp) $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y - $(call local-y-to-c-and-h) + $(call glsl_local-y-to-c-and-h) BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX) |