Mercurial > hg > tipic

diff Makefile.inc @ 35:474f45cfd3fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add downsampling outputs -- haven't yet got delay compensation in there though
author Chris Cannam
date Wed, 30 Sep 2015 16:15:36 +0100
parents 63959419587f
children bfd9acbcfd7c
line wrap: on
line diff
--- a/Makefile.inc	Wed Sep 30 15:27:04 2015 +0100
+++ b/Makefile.inc	Wed Sep 30 16:15:36 2015 +0100
@@ -24,8 +24,8 @@
 
 PUBLIC_HEADERS	:=
 
-LIB_HEADERS	:= $(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
-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
+LIB_HEADERS	:= $(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
+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
 LIB_OBJECTS	:= $(LIB_SOURCES:.cpp=.o)
 LIB_OBJECTS	:= $(LIB_OBJECTS:.c=.o)
 
@@ -95,7 +95,6 @@
 
 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/Filter.o: 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
@@ -103,20 +102,22 @@
 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/Chroma.o: src/Chroma.h src/Types.h src/FeatureDownsample.h
+src/Chroma.o: src/Normalise.h src/LogCompress.h 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/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 bqvec/bqvec/Range.h
-src/TipicVampPlugin.o: bqvec/bqvec/VectorOps.h bqvec/bqvec/Restrict.h
-src/TipicVampPlugin.o: bqvec/bqvec/Allocators.h
+src/TipicVampPlugin.o: src/DCT.h src/Chroma.h src/FeatureDownsample.h
+src/TipicVampPlugin.o: bqvec/bqvec/Range.h bqvec/bqvec/VectorOps.h
+src/TipicVampPlugin.o: bqvec/bqvec/Restrict.h
 src/libmain.o: src/TipicVampPlugin.h src/Types.h
-bqvec/src/Allocators.o: bqvec/bqvec/Allocators.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/PitchFilterbank.o: src/Types.h
 src/CRP.o: src/Types.h src/DCTReduce.h src/DCT.h
-src/Chroma.o: src/Types.h
+src/Chroma.o: src/Types.h src/FeatureDownsample.h
+src/FeatureDownsample.o: src/Types.h
 src/TipicVampPlugin.o: src/Types.h