From ec5153ab5782dcad7fdaaaabaa2f39300e31f012 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 Dec 2013 20:56:31 +0100 Subject: [PATCH] (Android) Build fix --- android/native/jni/Android.mk | 2 +- audio/sinc.c | 6 +++--- audio/utils.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 13f8663be9..7def4da695 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -47,7 +47,7 @@ ifeq ($(PERF_TEST), 1) LOCAL_CFLAGS += -DPERF_TEST endif -LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -I../../../deps/miniz -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA +LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -I../../../deps/miniz -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_CAMERA -DRARCH_INTERNAL LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl diff --git a/audio/sinc.c b/audio/sinc.c index 6931c61ba3..13adcac4a1 100644 --- a/audio/sinc.c +++ b/audio/sinc.c @@ -498,10 +498,10 @@ static void *resampler_sinc_new(double bandwidth_mod) #elif defined(__SSE__) RARCH_LOG("Sinc resampler [SSE]\n"); #elif defined(HAVE_NEON) - struct rarch_cpu_features cpu; + unsigned cpu; rarch_get_cpu_features(&cpu); - process_sinc_func = cpu.simd & RARCH_SIMD_NEON ? process_sinc_neon : process_sinc_C; - RARCH_LOG("Sinc resampler [%s]\n", cpu.simd & RARCH_SIMD_NEON ? "NEON" : "C"); + process_sinc_func = cpu & RETRO_SIMD_NEON ? process_sinc_neon : process_sinc_C; + RARCH_LOG("Sinc resampler [%s]\n", cpu & RETRO_SIMD_NEON ? "NEON" : "C"); #else RARCH_LOG("Sinc resampler [C]\n"); #endif diff --git a/audio/utils.c b/audio/utils.c index 346c0929aa..4451c05249 100644 --- a/audio/utils.c +++ b/audio/utils.c @@ -170,11 +170,11 @@ static void audio_convert_float_to_s16_neon(int16_t *out, const float *in, size_ void audio_convert_init_simd(void) { #ifdef HAVE_NEON - struct rarch_cpu_features cpu; + unsigned cpu; rarch_get_cpu_features(&cpu); - audio_convert_s16_to_float_arm = cpu.simd & RARCH_SIMD_NEON ? + audio_convert_s16_to_float_arm = cpu & RETRO_SIMD_NEON ? audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C; - audio_convert_float_to_s16_arm = cpu.simd & RARCH_SIMD_NEON ? + audio_convert_float_to_s16_arm = cpu & RETRO_SIMD_NEON ? audio_convert_float_to_s16_neon : audio_convert_float_to_s16_C; #endif }