[vlc-commits] audio_filter: fix no-NEON ARM builds

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug 27 15:23:09 2015 +0200| [64011dbece80d5fd54128c0f3f30b671e29f9d15] | committer: Thomas Guillem

audio_filter: fix no-NEON ARM builds

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64011dbece80d5fd54128c0f3f30b671e29f9d15
---

 modules/audio_filter/Makefile.am            |    2 ++
 modules/audio_filter/channel_mixer/simple.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
index 978edf8..372d08e 100644
--- a/modules/audio_filter/Makefile.am
+++ b/modules/audio_filter/Makefile.am
@@ -56,8 +56,10 @@ libtrivial_channel_mixer_plugin_la_SOURCES = \
 	audio_filter/channel_mixer/trivial.c
 libsimple_channel_mixer_plugin_la_SOURCES = \
 	audio_filter/channel_mixer/simple.c
+libsimple_channel_mixer_plugin_la_CFLAGS =
 if HAVE_NEON
 libsimple_channel_mixer_plugin_la_SOURCES += arm_neon/simple_channel_mixer.S
+libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
 endif
 
 audio_filter_LTLIBRARIES += \
diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index f825f98..25af5a8 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -258,7 +258,7 @@ static void DoWork_6_1_to_5_x( filter_t * p_filter,  block_t * p_in_buf, block_t
     }
 }
 
-#if defined (__arm__)
+#if defined (CAN_COMPILE_ARM)
 #include "simple_neon.h"
 #define GET_WORK(in, out) GET_WORK_##in##_to_##out##_neon()
 #else