diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 09:00:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 09:00:27 +0200 |
| commit | 51a003c23f4e27a826e56b0a3465d1e3e922d678 (patch) | |
| tree | 502470d9e5724764860fe16653b0f73a77fb6983 /mesalib/src/mesa/drivers/dri/Android.mk | |
| parent | bdc38022df44bde91e7ff95f6446cf20e19eaa5f (diff) | |
| parent | 324c1ed4069c7d49d0ff7c63261281148f9b6cd8 (diff) | |
| download | vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.tar.gz vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.tar.bz2 vcxsrv-51a003c23f4e27a826e56b0a3465d1e3e922d678.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_in.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
mesalib/src/mesa/swrast/s_context.c
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/Android.mk')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/Android.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Android.mk b/mesalib/src/mesa/drivers/dri/Android.mk index b8ccd0c1b..577f66408 100644 --- a/mesalib/src/mesa/drivers/dri/Android.mk +++ b/mesalib/src/mesa/drivers/dri/Android.mk @@ -31,6 +31,11 @@ include $(LOCAL_PATH)/common/Makefile.sources MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri +MESA_DRI_CFLAGS := \ + -DFEATURE_GL=1 \ + -DFEATURE_ES1=1 \ + -DFEATURE_ES2=1 + MESA_DRI_C_INCLUDES := \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ $(DRM_TOP) \ @@ -55,6 +60,10 @@ MESA_DRI_SHARED_LIBRARIES := \ SUBDIRS := common +ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),) + SUBDIRS += i915 +endif + ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),) SUBDIRS += i965 endif |