Mercurial > hg > qm-dsp
diff build/general/Makefile.inc @ 154:f47182362b51
Update non-qmake build system, remove qmake-based one
| author | Chris Cannam |
|---|---|
| date | Mon, 21 Oct 2013 17:49:10 +0100 |
| parents | 110efec1275c |
| children | 529f42b50d81 |
line wrap: on
line diff
--- a/build/general/Makefile.inc Mon Oct 21 11:59:57 2013 +0100 +++ b/build/general/Makefile.inc Mon Oct 21 17:49:10 2013 +0100 @@ -5,11 +5,13 @@ AR ?= ar RANLIB ?= ranlib -CFLAGS := $(CFLAGS) -I. -CXXFLAGS := $(CXXFLAGS) -I. +CFLAGS := $(CFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double +CXXFLAGS := $(CXXFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double HEADERS := base/Pitch.h \ base/Window.h \ + base/KaiserWindow.h \ + base/SincWindow.h \ dsp/chromagram/Chromagram.h \ dsp/chromagram/ConstantQ.h \ dsp/keydetection/GetKeyMode.h \ @@ -18,6 +20,7 @@ dsp/onsets/PeakPicking.h \ dsp/phasevocoder/PhaseVocoder.h \ dsp/rateconversion/Decimator.h \ + dsp/rateconversion/Resampler.h \ dsp/rhythm/BeatSpectrum.h \ dsp/segmentation/cluster_melt.h \ dsp/segmentation/ClusterMeltSegmenter.h \ @@ -46,9 +49,13 @@ maths/pca/pca.h \ thread/AsynchronousTask.h \ thread/BlockAllocator.h \ - thread/Thread.h + thread/Thread.h \ + ext/kissfft/kiss_fft.h \ + ext/kissfft/tools/kiss_fftr.h SOURCES := base/Pitch.cpp \ + base/KaiserWindow.cpp \ + base/SincWindow.cpp \ dsp/chromagram/Chromagram.cpp \ dsp/chromagram/ConstantQ.cpp \ dsp/keydetection/GetKeyMode.cpp \ @@ -57,6 +64,7 @@ dsp/onsets/PeakPicking.cpp \ dsp/phasevocoder/PhaseVocoder.cpp \ dsp/rateconversion/Decimator.cpp \ + dsp/rateconversion/Resampler.cpp \ dsp/rhythm/BeatSpectrum.cpp \ dsp/segmentation/cluster_melt.c \ dsp/segmentation/ClusterMeltSegmenter.cpp \ @@ -80,7 +88,9 @@ maths/KLDivergence.cpp \ maths/MathUtilities.cpp \ maths/pca/pca.c \ - thread/Thread.cpp + thread/Thread.cpp \ + ext/kissfft/kiss_fft.c \ + ext/kissfft/tools/kiss_fftr.c OBJECTS := $(SOURCES:.cpp=.o) OBJECTS := $(OBJECTS:.c=.o) @@ -90,7 +100,7 @@ $(RANLIB) $@ clean: - rm $(OBJECTS) + rm -f $(OBJECTS) distclean: clean - rm $(LIBRARY) + rm -f $(LIBRARY)