mesa: Fix packing/unpacking of MESA_FORMAT_R5G6B5_UNORM

[mesa.git] / src / mesa / Android.libmesa_dricore.mk

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 00c06943c0ba2b73a9f8922a9bc2ed9e3fdcd9f3..2ab593d3cc0e5b59c948924e592ae21052220546 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -32,14 +32,14 @@ LOCAL_PATH := $(call my-dir)
 #     MESA_FILES
 #     X86_FILES
 include $(LOCAL_PATH)/Makefile.sources
+SRCDIR :=
+BUILDDIR :=
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_dricore
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-MESA_ENABLED_APIS := ES1 ES2 GL
-
 LOCAL_SRC_FILES := \
        $(MESA_FILES)
 
@@ -49,13 +49,24 @@ ifeq ($(TARGET_ARCH),x86)
 endif # x86
 endif # MESA_ENABLE_ASM
 
-LOCAL_CFLAGS := \
-   $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_SRC_FILES += \
+       $(SRCDIR)main/streaming-load-memcpy.c \
+       $(SRCDIR)main/sse_minmax.c
+LOCAL_CFLAGS := -msse4.1
+endif
+
+ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_CFLAGS += \
+       -DUSE_SSE41
+endif
 
 LOCAL_C_INCLUDES := \
        $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/glsl
+       $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_program