diff options
| author | Arun Raghavan <git@arunraghavan.net> | 2015-10-19 11:48:52 +0530 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2015-10-19 11:48:52 +0530 |
| commit | a6e73f4d94acbba1d023a814557cd669e0832f95 (patch) | |
| tree | 600d1c96502fd0b97415c7f886206f4a5982dbe0 /webrtc | |
| parent | 7d9c65b62509f9705bc7704069a1883510e3314d (diff) | |
| download | webrtc-audio-processing-a6e73f4d94acbba1d023a814557cd669e0832f95.tar.gz | |
build: Conditionally build C variants of assembler-optimised code
Diffstat (limited to 'webrtc')
| -rw-r--r-- | webrtc/common_audio/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/webrtc/common_audio/Makefile.am b/webrtc/common_audio/Makefile.am index b685598..3ff1de8 100644 --- a/webrtc/common_audio/Makefile.am +++ b/webrtc/common_audio/Makefile.am @@ -19,7 +19,6 @@ libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \ signal_processing/include/spl_inl_mips.h \ signal_processing/auto_corr_to_refl_coef.c \ signal_processing/auto_correlation.c \ - signal_processing/complex_bit_reverse.c \ signal_processing/complex_fft.c \ signal_processing/complex_fft_tables.h \ signal_processing/copy_set_operations.c \ @@ -29,7 +28,6 @@ libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \ signal_processing/downsample_fast.c \ signal_processing/energy.c \ signal_processing/filter_ar.c \ - signal_processing/filter_ar_fast_q12.c \ signal_processing/filter_ma_fast_q12.c \ signal_processing/get_hanning_window.c \ signal_processing/get_scaling_square.c \ @@ -48,7 +46,6 @@ libcommon_audio_la_SOURCES = resampler/include/push_resampler.h \ signal_processing/resample_fractional.c \ signal_processing/spl_init.c \ signal_processing/spl_sqrt.c \ - signal_processing/spl_sqrt_floor.c \ signal_processing/splitting_filter.c \ signal_processing/sqrt_of_one_minus_x_squared.c \ signal_processing/vector_scaling_operations.c \ @@ -123,6 +120,14 @@ libcommon_audio_la_SOURCES += \ fir_filter_neon.h endif +if !HAVE_ARM +# FIXME: This condition will also hold for !HAVE_MIPS +libcommon_audio_la_SOURCES += \ + signal_processing/complex_bit_reverse.c \ + signal_processing/filter_ar_fast_q12.c \ + signal_processing/spl_sqrt_floor.c +endif + libcommon_audio_la_CCASFLAGS = $(AM_CCASFLAGS) $(COMMON_CFLAGS) libcommon_audio_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) libcommon_audio_la_CXXFLAGS = $(AM_CXXFLAGS) $(COMMON_CXXFLAGS) |