diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
| commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
| tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /mesalib/src/mesa/program | |
| parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
| parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
| download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/Android.mk b/mesalib/src/mesa/program/Android.mk index 3f974ea27..29a1b6a63 100644 --- a/mesalib/src/mesa/program/Android.mk +++ b/mesalib/src/mesa/program/Android.mk @@ -71,9 +71,6 @@ $(intermediates)/program/program_parse.tab.h: $(intermediates)/program/program_p $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l $(local-l-to-c) -LOCAL_CFLAGS := \ - $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) - LOCAL_C_INCLUDES := \ $(intermediates) \ $(MESA_TOP)/src/mapi \ |