st/mesa: use MAX3() macro, as we do for sampler view code below

[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 c2a4c288b75d98c207497c0291da51f2bf99c98c..ba952da4ad4aff7f9fa99c11fd1b8e893f4f577a 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -49,21 +49,18 @@ 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 += \
+       main/streaming-load-memcpy.c \
+       main/sse_minmax.c
+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/mesa/main \
        $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/compiler/nir \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary