diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
| commit | 112d89481850102f28b6e7ff4f40b65c41e11f6c (patch) | |
| tree | 9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/gallium/Android.mk | |
| parent | bcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff) | |
| parent | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff) | |
| download | vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2 vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/Android.mk')
| -rw-r--r-- | mesalib/src/gallium/Android.mk | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/mesalib/src/gallium/Android.mk b/mesalib/src/gallium/Android.mk index 85334cf69..bf99e4fb6 100644 --- a/mesalib/src/gallium/Android.mk +++ b/mesalib/src/gallium/Android.mk @@ -26,14 +26,20 @@ GALLIUM_TOP := $(call my-dir) GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk -SUBDIRS := \ - targets/egl-static \ - state_trackers/egl \ - auxiliary +SUBDIRS := auxiliary + +# +# Gallium drivers and their respective winsys +# # swrast SUBDIRS += winsys/sw/android drivers/softpipe +# freedreno +ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),) +SUBDIRS += winsys/freedreno/drm drivers/freedreno +endif + # i915g ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/i915/drm drivers/i915 @@ -57,6 +63,8 @@ SUBDIRS += winsys/radeon/drm ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) SUBDIRS += drivers/r300 endif +ifneq ($(filter r600g radeonsi, $(MESA_GPU_DRIVERS)),) +SUBDIRS += drivers/radeon ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) SUBDIRS += drivers/r600 endif @@ -64,11 +72,17 @@ ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),) SUBDIRS += drivers/radeonsi endif endif +endif # vmwgfx ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/svga/drm drivers/svga endif +# +# Gallium state trackers and their users (targets) +# +SUBDIRS += state_trackers/egl targets/egl-static + mkfiles := $(patsubst %,$(GALLIUM_TOP)/%/Android.mk,$(SUBDIRS)) include $(mkfiles) |