android, dricore: undefined reference to _mesa_streaming_load_memcpy

[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 48a37a1973045cbc266cdff4118da44bfa4b518b..217f6498a79f1a8155f43f05a2c33c2627f43180 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -31,15 +31,13 @@ LOCAL_PATH := $(call my-dir)
 # Import the following variables:
 #     MESA_FILES
 #     X86_FILES
-include $(LOCAL_PATH)/sources.mak
+include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_dricore
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-MESA_ENABLED_APIS := ES1 ES2 GL
-
 LOCAL_SRC_FILES := \
        $(MESA_FILES)
 
@@ -49,12 +47,19 @@ 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
+endif
 
 LOCAL_C_INCLUDES := \
+       $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/glsl
+       $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/gallium/auxiliary
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libmesa_program
 
 include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)