diff options
author | marha <marha@users.sourceforge.net> | 2011-08-31 11:39:10 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-08-31 11:39:10 +0200 |
commit | bdc38022df44bde91e7ff95f6446cf20e19eaa5f (patch) | |
tree | 63386f21679537a891a7cc44fb7dc15ad57cf1df /mesalib/Android.mk | |
parent | a15173d276fcc8bb45637bba9f027136f4915652 (diff) | |
parent | d14fe6598b87092374b1be6eb655153d270c3066 (diff) | |
download | vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.gz vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.bz2 vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/README.WIN32
mesalib/docs/install.html
mesalib/src/glu/sgi/include/gluos.h
mesalib/src/mesa/drivers/windows/gdi/wgl.c
mesalib/src/mesa/main/state.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/tnl/t_draw.c
Diffstat (limited to 'mesalib/Android.mk')
-rw-r--r-- | mesalib/Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/Android.mk b/mesalib/Android.mk index bc4b74e30..7c7c55a11 100644 --- a/mesalib/Android.mk +++ b/mesalib/Android.mk @@ -23,7 +23,7 @@ # BOARD_GPU_DRIVERS should be defined. The valid values are # -# classic drivers: +# classic drivers: i965 # gallium drivers: swrast i915g nouveau r300g r600g vmwgfx # # The main target is libGLES_mesa. For each classic driver enabled, a DRI @@ -36,7 +36,7 @@ MESA_PYTHON2 := python DRM_TOP := external/drm DRM_GRALLOC_TOP := hardware/drm_gralloc -classic_drivers := +classic_drivers := i965 gallium_drivers := swrast i915g nouveau r300g r600g vmwgfx MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS)) @@ -78,7 +78,9 @@ SUBDIRS := \ src/egl/main ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) -SUBDIRS += src/egl/drivers/dri2 +SUBDIRS += \ + src/egl/drivers/dri2 \ + src/mesa/drivers/dri endif ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) |