mesa: modify _mesa_copy_linked_program_data() to take gl_linked_shader

[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 217f6498a79f1a8155f43f05a2c33c2627f43180..86196ceb36abf10513316005d31655174fd6737e 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -48,17 +48,25 @@ endif # x86
 endif # MESA_ENABLE_ASM
 
 ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_SRC_FILES += \
-       $(SRCDIR)main/streaming-load-memcpy.c
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+       libmesa_sse41
+LOCAL_CFLAGS := \
+       -msse4.1 \
+       -DUSE_SSE41
 endif
 
 LOCAL_C_INCLUDES := \
-       $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/gallium/auxiliary
+       $(MESA_TOP)/src/mesa/main \
+       $(MESA_TOP)/src/compiler/nir \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary \
+       $(dir $(MESA_GEN_GLSL_H))
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+LOCAL_GENERATED_SOURCES += \
+       $(MESA_GEN_GLSL_H)
+
+LOCAL_WHOLE_STATIC_LIBRARIES += \
        libmesa_program
 
 include $(LOCAL_PATH)/Android.gen.mk