vlc/vlc-3.0 | branch: master | Martin Storsjö <[email protected]> | Sat Jun 29 00:15:32 2019 +0300| [19d8d73bfda2801099cca4cc01b8d22e4fb69675] | committer: Martin Storsjö
simple_channel_mixer: Don't include the common AM_LDFLAGS for the arm_neon static library This avoids including module.rc.o in the helper static library when building for windows, avoiding a duplicate module.rc.o for the real simple_channel_mixer plugin. Recent lld versions error out if two resource object files are passed to the same link. (If GNU ld is presented with two resource object files, it tries to merge the resources. In this case, as both object files contain the same resource, they would conflict, and GNU ld would print an error message, but still complete the link successfully.) (cherry picked from commit 593d0ec84fde7c2b98d051e44f66b01de8a761fa) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=19d8d73bfda2801099cca4cc01b8d22e4fb69675 --- modules/audio_filter/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am index fde73b968d..309074c75b 100644 --- a/modules/audio_filter/Makefile.am +++ b/modules/audio_filter/Makefile.am @@ -67,6 +67,9 @@ libsimple_channel_mixer_plugin_la_LIBADD = if HAVE_NEON EXTRA_LTLIBRARIES += libsimple_channel_mixer_plugin_arm_neon.la libsimple_channel_mixer_plugin_arm_neon_la_SOURCES = arm_neon/simple_channel_mixer.S +# Intentionally leaving out AM_LDFLAGS from this one; it's not meant to be +# built like a plugin. +libsimple_channel_mixer_plugin_arm_neon_la_LDFLAGS = -static libsimple_channel_mixer_plugin_la_LIBADD += libsimple_channel_mixer_plugin_arm_neon.la libsimple_channel_mixer_plugin_la_CFLAGS += -DCAN_COMPILE_NEON _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
