Fix speex build

This commit is contained in:
Chris Cannam
2022-06-30 14:00:14 +01:00
parent 1ed625b5d3
commit 75c1bdc015
3 changed files with 15 additions and 2 deletions

View File

@@ -15,10 +15,23 @@ tasks:
- setup: | - setup: |
cd rubberband cd rubberband
meson build meson build
meson build_speex -Dresampler=speex
meson build_libsamplerate -Dresampler=libsamplerate
meson build_fftw -Dfft=fftw
- build: | - build: |
cd rubberband cd rubberband
ninja -C build ninja -C build
meson test -C build meson test -C build
build/rubberband -V
ninja -C build_speex
meson test -C build_speex
build_speex/rubberband -V
ninja -C build_libsamplerate
meson test -C build_libsamplerate
build_libsamplerate/rubberband -V
ninja -C build_fftw
meson test -C build_fftw
build_fftw/rubberband -V
./otherbuilds/check.sh ./otherbuilds/check.sh
triggers: triggers:
- action: email - action: email

View File

@@ -241,7 +241,7 @@ elif resampler == 'speex'
config_summary += { 'Resampler': 'Speex' } config_summary += { 'Resampler': 'Speex' }
message('For resampler: using Speex') message('For resampler: using Speex')
message('(consider libsamplerate if time-varying pitch shift is required)') message('(consider libsamplerate if time-varying pitch shift is required)')
feature_sources += ['src/speex/resample.c'] feature_sources += ['src/ext/speex/resample.c']
feature_defines += ['-DUSE_SPEEX'] feature_defines += ['-DUSE_SPEEX']
elif resampler == 'ipp' elif resampler == 'ipp'

View File

@@ -54,7 +54,7 @@
#endif #endif
#ifdef USE_SPEEX #ifdef USE_SPEEX
#include "../speex/speex_resampler.h" #include "../ext/speex/speex_resampler.h"
#endif #endif
#ifdef USE_BQRESAMPLER #ifdef USE_BQRESAMPLER