Skip to content

Commit

Permalink
build: avoid adding assembler source code conditionally
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Flameeyes authored and jbkempf committed Dec 8, 2015
1 parent c4cd717 commit a1b2ad2
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion modules/audio_filter/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a1b2ad2

Please sign in to comment.