summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Dieter <rdieter@math.unl.edu>2016-06-21 16:46:48 +0530
committerArun Raghavan <arun@arunraghavan.net>2016-06-21 16:46:48 +0530
commit066cf53da73779086ada515d7633279c53d72fa2 (patch)
treebc301cb767922cbb9563c1837753923f8741e6bc
parentd58164e4d87854233564b59e76259b72e21507f6 (diff)
build: Make sure files with SSE2 code are compiled with -msse2
Signed-off-by: Arun Raghavan <arun@arunraghavan.net>
-rw-r--r--webrtc/common_audio/Makefile.am9
-rw-r--r--webrtc/modules/audio_processing/Makefile.am8
2 files changed, 15 insertions, 2 deletions
diff --git a/webrtc/common_audio/Makefile.am b/webrtc/common_audio/Makefile.am
index 3ff1de8..3bbd318 100644
--- a/webrtc/common_audio/Makefile.am
+++ b/webrtc/common_audio/Makefile.am
@@ -93,10 +93,17 @@ libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \
window_generator.cc
if HAVE_X86
-libcommon_audio_la_SOURCES += \
+noinst_LTLIBRARIES += libcommon_audio_sse2.la
+libcommon_audio_sse2_la_SOURCES = \
resampler/sinc_resampler_sse.cc \
fir_filter_sse.cc \
fir_filter_sse.h
+
+libcommon_audio_sse2_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
+libcommon_audio_sse2_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
+libcommon_audio_sse2_la_LDFLAGS = $(AM_LDFLAGS)
+
+libcommon_audio_la_LIBADD = libcommon_audio_sse2.la
endif
if HAVE_ARM
diff --git a/webrtc/modules/audio_processing/Makefile.am b/webrtc/modules/audio_processing/Makefile.am
index 6a5c508..30ca898 100644
--- a/webrtc/modules/audio_processing/Makefile.am
+++ b/webrtc/modules/audio_processing/Makefile.am
@@ -147,9 +147,14 @@ libwebrtc_audio_processing_la_SOURCES += \
endif
if HAVE_X86
-libwebrtc_audio_processing_la_SOURCES += \
+noinst_LTLIBRARIES = libwebrtc_audio_processing_privatearch.la
+LIBWEBRTC_PRIVATEARCH=libwebrtc_audio_processing_privatearch.la
+libwebrtc_audio_processing_privatearch_la_SOURCES = \
aec/aec_core_sse2.c \
aec/aec_rdft_sse2.c
+libwebrtc_audio_processing_privatearch_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) -msse2
+libwebrtc_audio_processing_privatearch_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) -msse2
+libwebrtc_audio_processing_privatearch_la_LDFLAGS = $(AM_LDFLAGS)
endif
if HAVE_NEON
@@ -167,6 +172,7 @@ libwebrtc_audio_processing_la_LIBADD = $(top_builddir)/webrtc/libwebrtc.la \
$(top_builddir)/webrtc/system_wrappers/libsystem_wrappers.la \
$(top_builddir)/webrtc/common_audio/libcommon_audio.la \
$(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la \
+ $(LIBWEBRTC_PRIVATEARCH) \
-lpthread
libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) \
-Wl,--no-undefined \