[Mesa-stable] [Mesa-dev] [PATCH 16/16] android: mesa: fix the path of the SSE4_1 optimisations

[Chih-Wei Huang]

2015-03-29 4:54 GMT+08:00 Emil Velikov <emil.l.velikov at gmail.com>:
> Commit dd6f641303c(mesa: Build with subdir-objects.) removed the SRCDIR
> variable, but forgot to update all references of it.
>
> Cc: "10.5" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/mesa/Android.libmesa_dricore.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
> index c2a4c28..da6176a 100644
> --- a/src/mesa/Android.libmesa_dricore.mk
> +++ b/src/mesa/Android.libmesa_dricore.mk
> @@ -49,8 +49,8 @@ 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
> +       $(MESA_TOP)/src/mesa/main/streaming-load-memcpy.c \
> +       $(MESA_TOP)/src/mesa/main/sse_minmax.c

Ah, just notice this is incorrect.
The path of files in LOCAL_SRC_FILES must be
relative to the $(LOCAL_PATH).
So it should be

LOCAL_SRC_FILES += \
        main/streaming-load-memcpy.c \
        main/sse_minmax.c

>  LOCAL_CFLAGS := -msse4.1
>  endif

I saw there are two adjacent sections of
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
How about combine them together?

> --


-- 
Chih-Wei
Android-x86 project
http://www.android-x86.org