Mercurial > hg > tipic

diff Makefile.inc @ 42:00b6ae41efbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to use qm-dsp instead of files from constant-q-cpp and bqvec. Some of the classes here (e.g. DCT) have moved to qm-dsp in the meantime.
author Chris Cannam
date Wed, 07 Oct 2015 11:46:33 +0100
parents bfd9acbcfd7c
children 54b308dc8910
line wrap: on
line diff
--- a/Makefile.inc	Wed Oct 07 09:22:40 2015 +0100
+++ b/Makefile.inc	Wed Oct 07 11:46:33 2015 +0100
@@ -3,8 +3,7 @@
 
 VAMPSDK_DIR  ?= ../vamp-plugin-sdk
 
-CQ_DIR	     ?= constant-q-cpp
-BQVEC_DIR    ?= bqvec
+QMDSP_DIR    := qm-dsp
 
 PLUGIN_EXT	?= .so
 
@@ -13,8 +12,8 @@
 AR	?= ar
 RANLIB	?= ranlib
 
-CFLAGS := $(CFLAGS)
-CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(CQ_DIR) -I$(BQVEC_DIR) -I$(BQVEC_DIR)/bqvec -I$(CQ_DIR)/src/dsp $(CXXFLAGS)
+CFLAGS := $(CFLAGS) -I$(QMDSP_DIR)/ext/kissfft -I$(QMDSP_DIR)/ext/kissfft/tools -Dkiss_fft_scalar=double
+CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(QMDSP_DIR) $(CXXFLAGS)
 
 LDFLAGS := $(LDFLAGS) 
 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
@@ -28,29 +27,41 @@
 		$(SRC_DIR)/delays.h \
 		$(SRC_DIR)/filter-a.h \
 		$(SRC_DIR)/filter-b.h \
-		$(SRC_DIR)/Filter.h \
 		$(SRC_DIR)/PitchFilterbank.h \
-		$(SRC_DIR)/DCT.h \
 		$(SRC_DIR)/Types.h \
 		$(SRC_DIR)/CRP.h \
-		$(SRC_DIR)/Normalise.h \
 		$(SRC_DIR)/LogCompress.h \
 		$(SRC_DIR)/OctaveFold.h \
 		$(SRC_DIR)/Resize.h \
 		$(SRC_DIR)/Chroma.h \
 		$(SRC_DIR)/FeatureDownsample.h \
 		$(SRC_DIR)/Quantize.h \
-		$(SRC_DIR)/CENS.h
-
+		$(SRC_DIR)/CENS.h \
+		$(QMDSP_DIR)/dsp/signalconditioning/Filter.h \
+		$(QMDSP_DIR)/dsp/transforms/DCT.h \
+		$(QMDSP_DIR)/dsp/transforms/FFT.h \
+		$(QMDSP_DIR)/dsp/rateconversion/Resampler.h \
+		$(QMDSP_DIR)/maths/MathUtilities.h \
+		$(QMDSP_DIR)/base/Window.h \
+		$(QMDSP_DIR)/base/KaiserWindow.h \
+		$(QMDSP_DIR)/base/SincWindow.h \
+		$(QMDSP_DIR)/ext/kissfft/tools/kiss_fftr.h
+		
 LIB_SOURCES	:= \
-		$(SRC_DIR)/Filter.cpp \
 		$(SRC_DIR)/PitchFilterbank.cpp \
-		$(SRC_DIR)/DCT.cpp \
 		$(SRC_DIR)/CRP.cpp \
-		$(SRC_DIR)/Normalise.cpp \
 		$(SRC_DIR)/Chroma.cpp \
 		$(SRC_DIR)/FeatureDownsample.cpp \
-		$(SRC_DIR)/CENS.cpp
+		$(SRC_DIR)/CENS.cpp \
+		$(QMDSP_DIR)/dsp/signalconditioning/Filter.cpp \
+		$(QMDSP_DIR)/dsp/transforms/DCT.cpp \
+		$(QMDSP_DIR)/dsp/transforms/FFT.cpp \
+		$(QMDSP_DIR)/dsp/rateconversion/Resampler.cpp \
+		$(QMDSP_DIR)/maths/MathUtilities.cpp \
+		$(QMDSP_DIR)/base/KaiserWindow.cpp \
+		$(QMDSP_DIR)/base/SincWindow.cpp \
+		$(QMDSP_DIR)/ext/kissfft/kiss_fft.c \
+		$(QMDSP_DIR)/ext/kissfft/tools/kiss_fftr.c
 		
 LIB_OBJECTS	:= $(LIB_SOURCES:.cpp=.o)
 LIB_OBJECTS	:= $(LIB_OBJECTS:.c=.o)
@@ -60,93 +71,74 @@
 PLUGIN_OBJECTS	:= $(PLUGIN_SOURCES:.cpp=.o)
 PLUGIN_OBJECTS	:= $(PLUGIN_OBJECTS:.c=.o)
 
-BQVEC_HEADERS	:= $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h
-BQVEC_SOURCES	:= $(BQVEC_DIR)/src/Allocators.cpp
-BQVEC_OBJECTS	:= $(BQVEC_SOURCES:.cpp=.o)
-BQVEC_OBJECTS	:= $(BQVEC_OBJECTS:.c=.o)
-
 TEST_SOURCES	:= $(SRC_DIR)/test-filter.cpp $(SRC_DIR)/test-dct.cpp $(SRC_DIR)/test-normalise.cpp
 TEST_OBJECTS	:= $(TEST_SOURCES:.cpp=.o)
 TEST_OBJECTS	:= $(TEST_OBJECTS:.c=.o)
 
-OTHER_OBJECTS	:= $(CQ_DIR)/src/dsp/FFT.o $(CQ_DIR)/src/ext/kissfft/kiss_fft.o $(CQ_DIR)/src/ext/kissfft/tools/kiss_fftr.o
-
-HEADERS	     := $(PUBLIC_HEADERS) $(LIB_HEADERS) $(PLUGIN_HEADERS) $(BQVEC_HEADERS)
-SOURCES	     := $(PUBLIC_SOURCES) $(LIB_SOURCES) $(PLUGIN_SOURCES) $(BQVEC_SOURCES) $(TEST_SOURCES)
+HEADERS	     := $(PUBLIC_HEADERS) $(LIB_HEADERS) $(PLUGIN_HEADERS)
+SOURCES	     := $(PUBLIC_SOURCES) $(LIB_SOURCES) $(PLUGIN_SOURCES) $(TEST_SOURCES)
 OBJECTS	     := $(SOURCES:.cpp=.o)
 OBJECTS	     := $(OBJECTS:.c=.o)
 
-LIBS	:= $(CQ_DIR)/libcq.a $(VAMPSDK_DIR)/libvamp-sdk.a
+LIBS	     := $(VAMPSDK_DIR)/libvamp-sdk.a
 
-all: constant-q-cpp $(LIBRARY) $(PLUGIN) tests
+all: $(LIBRARY) $(PLUGIN)
 
-.PHONY: constant-q-cpp
-constant-q-cpp: 
-	$(MAKE) -C $@ -f Makefile$(MAKEFILE_EXT) libcq.a
-
-$(PLUGIN):	$(PLUGIN_OBJECTS) $(LIB_OBJECTS) $(BQVEC_OBJECTS) $(LIBS)
+$(PLUGIN):	$(PLUGIN_OBJECTS) $(LIB_OBJECTS) $(LIBS)
 	$(CXX) -o $@ $^ $(LIBS) $(PLUGIN_LDFLAGS)
 
-$(LIBRARY):    $(LIB_OBJECTS) $(BQVEC_OBJECTS) $(OTHER_OBJECTS)
+$(LIBRARY):    $(LIB_OBJECTS)
 	$(RM) -f $@
 	$(AR) cr $@ $^
 	$(RANLIB) $@
 
-.PHONY:	tests
-tests:	test-dct test-filter test-normalise
-	./test-dct
-	./test-filter
-	./test-normalise
-
-test-dct:	  $(TEST_OBJECTS) $(LIBRARY)
-	$(CXX) -o $@ src/test-dct.o $(LIBRARY)
-
-test-filter:	  $(TEST_OBJECTS) $(LIBRARY)
-	$(CXX) -o $@ src/test-filter.o $(LIBRARY)
-
-test-normalise:	  $(TEST_OBJECTS) $(LIBRARY)
-	$(CXX) -o $@ src/test-normalise.o $(LIBRARY)
-
 clean:		
 	rm -f $(OBJECTS)
-	$(MAKE) -C constant-q-cpp -f Makefile$(MAKEFILE_EXT) clean
 
 distclean:	clean
 	rm -f $(PLUGIN)
 
 depend:
-	makedepend -I$(BQVEC_DIR) -Y -fMakefile.inc $(SOURCES) $(HEADERS)
-
+	makedepend -Y -fMakefile.inc $(SOURCES) $(HEADERS)
+	
 # DO NOT DELETE
 
-src/Filter.o: src/Filter.h bqvec/bqvec/Restrict.h bqvec/bqvec/VectorOps.h
-src/Filter.o: bqvec/bqvec/Restrict.h bqvec/bqvec/Allocators.h
-src/PitchFilterbank.o: src/PitchFilterbank.h src/Types.h src/Filter.h
-src/PitchFilterbank.o: bqvec/bqvec/Restrict.h src/delays.h src/filter-a.h
-src/PitchFilterbank.o: src/filter-b.h
-src/DCT.o: src/DCT.h
-src/CRP.o: src/CRP.h src/Types.h src/DCTReduce.h src/DCT.h src/Normalise.h
-src/CRP.o: src/LogCompress.h src/OctaveFold.h src/Resize.h
-src/Normalise.o: src/Normalise.h
-src/Chroma.o: src/Chroma.h src/Types.h src/Normalise.h src/LogCompress.h
-src/Chroma.o: src/OctaveFold.h src/Resize.h
-src/FeatureDownsample.o: src/FeatureDownsample.h src/Types.h src/Filter.h
-src/FeatureDownsample.o: bqvec/bqvec/Restrict.h src/Normalise.h
-src/CENS.o: src/CENS.h src/Types.h src/Quantize.h src/Normalise.h
-src/CENS.o: src/OctaveFold.h src/Resize.h
+src/PitchFilterbank.o: src/PitchFilterbank.h src/Types.h src/delays.h
+src/PitchFilterbank.o: src/filter-a.h src/filter-b.h
+src/CRP.o: src/CRP.h src/Types.h src/DCTReduce.h src/LogCompress.h
+src/CRP.o: src/OctaveFold.h src/Resize.h
+src/Chroma.o: src/Chroma.h src/Types.h src/LogCompress.h src/OctaveFold.h
+src/Chroma.o: src/Resize.h
+src/FeatureDownsample.o: src/FeatureDownsample.h src/Types.h
+src/CENS.o: src/CENS.h src/Types.h src/Quantize.h src/OctaveFold.h
+src/CENS.o: src/Resize.h
+qm-dsp/dsp/signalconditioning/Filter.o: qm-dsp/dsp/signalconditioning/Filter.h
+qm-dsp/dsp/transforms/DCT.o: qm-dsp/dsp/transforms/DCT.h
+qm-dsp/dsp/transforms/DCT.o: qm-dsp/dsp/transforms/FFT.h
+qm-dsp/dsp/transforms/FFT.o: qm-dsp/dsp/transforms/FFT.h
+qm-dsp/dsp/rateconversion/Resampler.o: qm-dsp/dsp/rateconversion/Resampler.h
+qm-dsp/maths/MathUtilities.o: qm-dsp/maths/MathUtilities.h
+qm-dsp/maths/MathUtilities.o: qm-dsp/maths/nan-inf.h
+qm-dsp/base/KaiserWindow.o: qm-dsp/base/KaiserWindow.h
+qm-dsp/base/SincWindow.o: qm-dsp/base/SincWindow.h
+qm-dsp/ext/kissfft/kiss_fft.o: qm-dsp/ext/kissfft/_kiss_fft_guts.h
+qm-dsp/ext/kissfft/kiss_fft.o: qm-dsp/ext/kissfft/kiss_fft.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/tools/kiss_fftr.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/kiss_fft.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/_kiss_fft_guts.h
 src/TipicVampPlugin.o: src/TipicVampPlugin.h src/Types.h
 src/TipicVampPlugin.o: src/PitchFilterbank.h src/CRP.h src/DCTReduce.h
-src/TipicVampPlugin.o: src/DCT.h src/Chroma.h src/CENS.h src/Quantize.h
-src/TipicVampPlugin.o: src/FeatureDownsample.h bqvec/bqvec/Range.h
-src/TipicVampPlugin.o: bqvec/bqvec/VectorOps.h bqvec/bqvec/Restrict.h
+src/TipicVampPlugin.o: src/Chroma.h src/CENS.h src/Quantize.h
+src/TipicVampPlugin.o: src/FeatureDownsample.h
 src/libmain.o: src/TipicVampPlugin.h src/Types.h
-src/test-filter.o: src/Filter.h bqvec/bqvec/Restrict.h
-src/test-dct.o: src/DCT.h
-src/test-normalise.o: src/Normalise.h
-src/Filter.o: bqvec/bqvec/Restrict.h
+src/test-filter.o: qm-dsp/dsp/signalconditioning/Filter.h
+src/test-dct.o: qm-dsp/dsp/transforms/DCT.h qm-dsp/dsp/transforms/FFT.h
 src/PitchFilterbank.o: src/Types.h
-src/CRP.o: src/Types.h src/DCTReduce.h src/DCT.h
+src/CRP.o: src/Types.h src/DCTReduce.h
 src/Chroma.o: src/Types.h
 src/FeatureDownsample.o: src/Types.h
 src/CENS.o: src/Types.h src/Quantize.h
+qm-dsp/dsp/transforms/DCT.o: qm-dsp/dsp/transforms/FFT.h
+qm-dsp/maths/MathUtilities.o: qm-dsp/maths/nan-inf.h
+qm-dsp/ext/kissfft/tools/kiss_fftr.o: qm-dsp/ext/kissfft/kiss_fft.h
 src/TipicVampPlugin.o: src/Types.h