diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-30 23:24:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-30 23:24:30 +0200 |
| commit | a71d524ecad48837e0124a03124bc05f59a48be7 (patch) | |
| tree | 87c5ba1711e03cb9692e23cc685b938571b52d76 /mesalib/Android.mk | |
| parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
| download | vcxsrv-a71d524ecad48837e0124a03124bc05f59a48be7.tar.gz vcxsrv-a71d524ecad48837e0124a03124bc05f59a48be7.tar.bz2 vcxsrv-a71d524ecad48837e0124a03124bc05f59a48be7.zip | |
fontconfig pixman libX11 mesa git update 30 Apr 2015
libX11 commit d3415d1f052530760b4617db45affcb984cfe35c
pixman commit e0c0153d8e5d42c08c2b9bd2cf2123bff2c48d75
fontconfig commit 4a6f5efd5f6a468e1872d58e589bcf30ba88e2fd
mesa commit 1ac7db07b363207e8ded9259f84bbcaa084b8667
Diffstat (limited to 'mesalib/Android.mk')
| -rw-r--r-- | mesalib/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mesalib/Android.mk b/mesalib/Android.mk index e190f749b..b19419ba7 100644 --- a/mesalib/Android.mk +++ b/mesalib/Android.mk @@ -34,6 +34,13 @@ MESA_TOP := $(call my-dir) MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION))) MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION) +ifeq ($(filter 1 2 3 4,$(MESA_ANDROID_MAJOR_VERSION)),) +MESA_LOLLIPOP_BUILD := true +else +define local-generated-sources-dir +$(call local-intermediates-dir) +endef +endif MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON2 := python @@ -94,7 +101,6 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) SUBDIRS += src/gallium endif -mkfiles := $(patsubst %,$(MESA_TOP)/%/Android.mk,$(SUBDIRS)) -include $(mkfiles) +include $(call all-named-subdir-makefiles,$(SUBDIRS)) endif |