X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FAndroid.libmesa_dricore.mk;h=86196ceb36abf10513316005d31655174fd6737e;hb=713cd23d8e5db82e64c81fff792a932a614d7006;hp=904a92fb02e962af919276457b92cd4aec1b5b42;hpb=94cab35ee93ed200013eddffa4c97828bd6aa82c;p=mesa.git

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 904a92fb02e..86196ceb36a 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -48,25 +48,25 @@ endif # x86
 endif # MESA_ENABLE_ASM
 
 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 += \
+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/mesa/main \
+	$(MESA_TOP)/src/compiler/nir \
 	$(MESA_TOP)/src/gallium/include \
-	$(MESA_TOP)/src/gallium/auxiliary
+	$(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