Commit 13dd6a6c authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf

contrib: speexdsp: fix build with android-ndk10c

In android-ndk10c, there is a "arm_neon.h" for all archs. The arm_neon.h for
x86* contains correspondence between neon and sse. In speexdsp, There is a
conflict between resample_sse.h and resample_neon.h. So disable neon if arch is
known to don't have neon.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit ef98e81ff014175fd7494c8313de8883d15834b3)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 079c2364
...@@ -26,6 +26,9 @@ SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples ...@@ -26,6 +26,9 @@ SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples
ifndef HAVE_NEON ifndef HAVE_NEON
SPEEXDSP_CONF += --disable-neon SPEEXDSP_CONF += --disable-neon
endif endif
ifndef HAVE_NEON
SPEEXDSP_CONF += --disable-neon
endif
ifndef HAVE_FPU ifndef HAVE_FPU
SPEEXDSP_CONF += --enable-fixed-point SPEEXDSP_CONF += --enable-fixed-point
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment