vlc | branch: master | Diego Elio Pettenò <[email protected]> | Sun Dec 6 11:46:07 2015 +0000| [73808931347a70d2368bd5883c247f8e9b6cedf8] | committer: Thomas Guillem
build: avoid adding assembler source code conditionally. Instead, create an extra library and link that one in conditionally. This simplifies compiler language selection for the library. close #15395 Signed-off-by: Diego Elio Pettenò <[email protected]> Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73808931347a70d2368bd5883c247f8e9b6cedf8 --- modules/audio_filter/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am index c04b25c..da23f7e 100644 --- a/modules/audio_filter/Makefile.am +++ b/modules/audio_filter/Makefile.am @@ -57,8 +57,13 @@ libtrivial_channel_mixer_plugin_la_SOURCES = \ libsimple_channel_mixer_plugin_la_SOURCES = \ audio_filter/channel_mixer/simple.c libsimple_channel_mixer_plugin_la_CFLAGS = +libsimple_channel_mixer_plugin_la_LIBADD = + if HAVE_NEON -libsimple_channel_mixer_plugin_la_SOURCES += arm_neon/simple_channel_mixer.S +EXTRA_LTLIBRARIES += libsimple_channel_mixer_plugin_arm_neon.la +libsimple_channel_mixer_plugin_arm_neon_la_SOURCES = arm_neon/simple_channel_mixer.S + +libsimple_channel_mixer_plugin_la_LIBADD += libsimple_channel_mixer_plugin_arm_neon.la libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_ARM endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
