b4bd594db169 — Chris Cannam 8 months ago
Use built-in resampler by default; add a Speex-specific Makefile; ensure platform tests run default Makefile last, so any output left in test/e2e/out is representative of the BQ resampler
4 files changed, 15 insertions(+), 3 deletions(-)

M .build.yml
M Makefile
A => build/Makefile.linux.speex
M build/run-platform-tests.sh
M .build.yml +1 -0
@@ 3,6 3,7 @@ packages:
   - libboost-test-dev
   - valgrind
   - libsamplerate0-dev
+  - libsndfile-dev
   - curl
 sources:
   - hg+https://hg.sr.ht/~breakfastquay/bqresample

          
M Makefile +2 -2
@@ 15,7 15,7 @@ 
 # better to stick with a single known library. If no flags are
 # supplied, the code will refuse to compile.
 #
-RESAMPLE_DEFINES	:= -DHAVE_LIBSAMPLERATE
+RESAMPLE_DEFINES	:= -DUSE_BQRESAMPLER
 
 
 # Add to VECTOR_DEFINES and ALLOCATOR_DEFINES any options desired for

          
@@ 30,7 30,7 @@ ALLOCATOR_DEFINES 	:=
 # THIRD_PARTY_LIBS if using libsamplerate)
 #
 THIRD_PARTY_INCLUDES	:=
-THIRD_PARTY_LIBS	:= -lsamplerate
+THIRD_PARTY_LIBS	:=
 
 
 # If you are including a set of bq libraries into a project, you can

          
A => build/Makefile.linux.speex +11 -0
@@ 0,0 1,11 @@ 
+
+RESAMPLE_DEFINES	:= -DUSE_SPEEX
+
+VECTOR_DEFINES 		:= 
+
+ALLOCATOR_DEFINES 	:= -DHAVE_POSIX_MEMALIGN
+
+THIRD_PARTY_INCLUDES	:=
+THIRD_PARTY_LIBS	:=
+
+include build/Makefile.inc

          
M build/run-platform-tests.sh +1 -1
@@ 50,7 50,7 @@ run() {
     fi
 }
 
-for mf in Makefile build/Makefile.$platformtag build/Makefile.$platformtag.* ; do
+for mf in build/Makefile.$platformtag build/Makefile.$platformtag.* Makefile ; do
 
     case "$mf" in
 	*~) continue;;