diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-20 17:47:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-20 17:47:31 +0100 |
| commit | 78d84bd03c744b0ed420c450dd2807904ccaef21 (patch) | |
| tree | 5047a42b383693eed77091fb86950c6248681ad9 /mesalib/src/loader/Android.mk | |
| parent | 1917325d5254a9ca33dae8ee5817dfdb7be5a24a (diff) | |
| parent | 775780ea274e6602c2d64de33a98ee35979cc330 (diff) | |
| download | vcxsrv-78d84bd03c744b0ed420c450dd2807904ccaef21.tar.gz vcxsrv-78d84bd03c744b0ed420c450dd2807904ccaef21.tar.bz2 vcxsrv-78d84bd03c744b0ed420c450dd2807904ccaef21.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
ligXext mesa git update 20 Jan 2014
fontconfig mesa git update 19 Jan 2013
Conflicts:
mesalib/src/loader/Android.mk
mesalib/src/loader/Makefile.am
mesalib/src/loader/SConscript
mesalib/src/loader/loader.c
tools/mhmake/config.guess
Diffstat (limited to 'mesalib/src/loader/Android.mk')
| -rwxr-xr-x[-rw-r--r--] | mesalib/src/loader/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/loader/Android.mk b/mesalib/src/loader/Android.mk index 01699dcc5..6890af473 100644..100755 --- a/mesalib/src/loader/Android.mk +++ b/mesalib/src/loader/Android.mk @@ -35,7 +35,7 @@ LOCAL_SRC_FILES := \ # swrast only ifeq ($(MESA_GPU_DRIVERS),swrast) - LOCAL_CFLAGS += -D_EGL_NO_DRM + LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H else LOCAL_C_INCLUDES += \ $(DRM_TOP)/include/drm \ |