diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index ac8f268e00..d318c9e179 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -2,7 +2,8 @@ RARCH_VERSION = "0.9.8-beta3" LOCAL_PATH := $(call my-dir) PERF_TEST := 1 HAVE_OPENSL := 1 -WANT_NEON := 0 +WANT_NEON := 1 +HAVE_SINC := 1 include $(CLEAR_VARS) @@ -16,10 +17,18 @@ LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3 endif ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + ifeq ($(WANT_NEON),1) LOCAL_CFLAGS += -DWANT_NEON +endif + +ifeq ($(HAVE_SINC),1) +ifeq ($(WANT_NEON),1) LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon endif +LOCAL_CFLAGS += -DHAVE_SINC +endif + LOCAL_CFLAGS += -DANDROID_ARM_V7 endif diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index c355d5fa64..d0bd986416 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -247,7 +247,7 @@ FIFO BUFFER /*============================================================ AUDIO HERMITE ============================================================ */ -#ifdef WANT_NEON +#ifdef HAVE_SINC #include "../../audio/sinc.c" #else #include "../../audio/hermite.c"