Fix & test kissfft build

This commit is contained in:
Chris Cannam
2022-07-01 13:14:21 +01:00
parent 335aef35c9
commit ee3e7e45ff
2 changed files with 6 additions and 2 deletions

View File

@@ -19,6 +19,7 @@ tasks:
meson build_speex -Dresampler=speex meson build_speex -Dresampler=speex
meson build_libsamplerate -Dresampler=libsamplerate meson build_libsamplerate -Dresampler=libsamplerate
meson build_fftw -Dfft=fftw meson build_fftw -Dfft=fftw
meson build_kissfft -Dfft=kissfft
- build: | - build: |
cd rubberband cd rubberband
ninja -C build ninja -C build
@@ -33,6 +34,9 @@ tasks:
ninja -C build_fftw ninja -C build_fftw
meson test -C build_fftw meson test -C build_fftw
build_fftw/rubberband -V build_fftw/rubberband -V
ninja -C build_kissfft
meson test -C build_kissfft
build_kissfft/rubberband -V
./otherbuilds/check.sh ./otherbuilds/check.sh
triggers: triggers:
- action: email - action: email

View File

@@ -172,9 +172,9 @@ elif fft == 'kissfft'
if fftw3_dep.found() if fftw3_dep.found()
message('(to use FFTW instead, reconfigure with -Dfft=fftw)') message('(to use FFTW instead, reconfigure with -Dfft=fftw)')
endif endif
feature_sources += ['src/kissfft/kiss_fft.c', 'src/kissfft/kiss_fftr.c'] feature_sources += ['src/ext/kissfft/kiss_fft.c', 'src/ext/kissfft/kiss_fftr.c']
feature_defines += ['-DHAVE_KISSFFT'] feature_defines += ['-DHAVE_KISSFFT']
general_include_dirs += 'src/kissfft' general_include_dirs += 'src/ext/kissfft'
elif fft == 'fftw' elif fft == 'fftw'
if fftw3_dep.found() if fftw3_dep.found()