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/src/mesa/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/src/mesa/Android.mk')
| -rw-r--r-- | mesalib/src/mesa/Android.mk | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk index 67808d491..f21ba3aa0 100644 --- a/mesalib/src/mesa/Android.mk +++ b/mesalib/src/mesa/Android.mk @@ -25,6 +25,12 @@ LOCAL_PATH := $(call my-dir) +# Import the following variables: +# MESA_CXX_SOURCES +# MESA_GALLIUM_CXX_SOURCES +# MESA_GALLIUM_SOURCES +# MESA_SOURCES +# X86_SOURCES include $(LOCAL_PATH)/sources.mak common_CFLAGS := \ @@ -83,6 +89,35 @@ include $(BUILD_STATIC_LIBRARY) endif # MESA_BUILD_GALLIUM # --------------------------------------- +# Build libmesa_dricore for DRI modules +# --------------------------------------- + +ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_dricore +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +LOCAL_CFLAGS := \ + $(common_CFLAGS) \ + -DFEATURE_GL=1 + +LOCAL_C_INCLUDES := \ + $(common_C_INCLUDES) + +LOCAL_SRC_FILES := \ + $(MESA_SOURCES) \ + $(MESA_CXX_SOURCES) \ + $(common_ASM) + +include $(LOCAL_PATH)/Android.gen.mk +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_CLASSIC + +# --------------------------------------- # Build libmesa_glsl_utils # # It is used to avoid circular dependency between core mesa and glsl. |