diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
| commit | f15a40afaf6d1b3a4841d25631f947da1b289f89 (patch) | |
| tree | f2066dc8caaf2fddd3b88251d18839d5878bfd9b /mesalib/src/mesa/drivers | |
| parent | f2a3390c8b2052e8f65d3502dd703b5c5b23a28e (diff) | |
| parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
| download | vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.gz vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.bz2 vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa pixman git update 15 oct 2012
Conflicts:
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'mesalib/src/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Android.mk b/mesalib/src/mesa/drivers/dri/Android.mk index 577f66408..d6196bb43 100644 --- a/mesalib/src/mesa/drivers/dri/Android.mk +++ b/mesalib/src/mesa/drivers/dri/Android.mk @@ -34,7 +34,8 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri MESA_DRI_CFLAGS := \ -DFEATURE_GL=1 \ -DFEATURE_ES1=1 \ - -DFEATURE_ES2=1 + -DFEATURE_ES2=1 \ + -DHAVE_ANDROID_PLATFORM MESA_DRI_C_INCLUDES := \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ |