Mercurial > hg > qm-dsp

changeset 154:f47182362b51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update non-qmake build system, remove qmake-based one
author Chris Cannam
date Mon, 21 Oct 2013 17:49:10 +0100
parents 715f779d0b4f
children 529f42b50d81
files build/general/Makefile.inc build/linux/Makefile.linux build/linux/Makefile.linux64 qm-dsp.pro
diffstat 4 files changed, 18 insertions(+), 140 deletions(-) [+]
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)
--- a/build/linux/Makefile.linux	Mon Oct 21 11:59:57 2013 +0100
+++ b/build/linux/Makefile.linux	Mon Oct 21 17:49:10 2013 +0100
@@ -1,5 +1,5 @@
 
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
+CFLAGS := -DNDEBUG -O3 -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
 CXXFLAGS := $(CFLAGS)
 
 include build/general/Makefile.inc
--- a/build/linux/Makefile.linux64	Mon Oct 21 11:59:57 2013 +0100
+++ b/build/linux/Makefile.linux64	Mon Oct 21 17:49:10 2013 +0100
@@ -1,5 +1,5 @@
 
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -Ibuild/linux/amd64
+CFLAGS := -DNDEBUG -O3 -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -Ibuild/linux/amd64
 CXXFLAGS := $(CFLAGS)
 
 include build/general/Makefile.inc
--- a/qm-dsp.pro	Mon Oct 21 11:59:57 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-
-TEMPLATE = lib
-CONFIG += staticlib warn_on release
-CONFIG -= qt
-OBJECTS_DIR = tmp_obj
-MOC_DIR = tmp_moc
-
-# This one is vital
-QMAKE_CFLAGS += -Dkiss_fft_scalar=double
-QMAKE_CXXFLAGS += -Dkiss_fft_scalar=double
-
-INCLUDEPATH += ./ext/kissfft/tools ./ext/kissfft
-
-linux-g++* {
-    QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O3 -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer
-    DEFINES += USE_PTHREADS
-    INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp
-    LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp
-}
-
-linux-g++-64 {
-    QMAKE_CXXFLAGS_RELEASE += -msse2
-    INCLUDEPATH += ../qm-vamp-plugins/build/linux/amd64
-}
-
-win32-x-g++ {
-    QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O2 -march=pentium3 -msse
-    INCLUDEPATH += . include ../include
-}
-
-macx-g++* {
-    QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-    CONFIG += x86 ppc x86_64
-    QMAKE_CXX = g++-4.0
-    QMAKE_CC = gcc-4.0
-    QMAKE_CXXFLAGS_RELEASE += -mmacosx-version-min=10.4 -O2 -g0 -I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/
-    QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.4 
-    INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/
-    DEFINES += USE_PTHREADS
-}
-
-solaris* {
-    QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -fast
-    INCLUDEPATH += /opt/ATLAS3.9.14/include
-    DEFINES += USE_PTHREADS
-}
-
-INCLUDEPATH += . 
-
-# Input
-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 \
-           dsp/mfcc/MFCC.h \
-           dsp/onsets/DetectionFunction.h \
-           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 \
-           dsp/segmentation/cluster_segmenter.h \
-           dsp/segmentation/Segmenter.h \
-           dsp/segmentation/segment.h \
-           dsp/signalconditioning/DFProcess.h \
-           dsp/signalconditioning/Filter.h \
-           dsp/signalconditioning/FiltFilt.h \
-           dsp/signalconditioning/Framer.h \
-           dsp/tempotracking/DownBeat.h \
-           dsp/tempotracking/TempoTrack.h \
-           dsp/tempotracking/TempoTrackV2.h \
-           dsp/tonal/ChangeDetectionFunction.h \
-           dsp/tonal/TCSgram.h \
-           dsp/tonal/TonalEstimator.h \
-           dsp/transforms/FFT.h \
-           dsp/wavelet/Wavelet.h \
-           hmm/hmm.h \
-           maths/Correlation.h \
-           maths/CosineDistance.h \
-           maths/KLDivergence.h \
-           maths/MathAliases.h \
-           maths/MathUtilities.h \
-           maths/Polyfit.h \
-           maths/pca/pca.h \
-           thread/AsynchronousTask.h \
-           thread/BlockAllocator.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 \
-           dsp/mfcc/MFCC.cpp \
-           dsp/onsets/DetectionFunction.cpp \
-           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 \
-           dsp/segmentation/cluster_segmenter.c \
-           dsp/segmentation/Segmenter.cpp \
-           dsp/signalconditioning/DFProcess.cpp \
-           dsp/signalconditioning/Filter.cpp \
-           dsp/signalconditioning/FiltFilt.cpp \
-           dsp/signalconditioning/Framer.cpp \
-           dsp/tempotracking/DownBeat.cpp \
-           dsp/tempotracking/TempoTrack.cpp \
-           dsp/tempotracking/TempoTrackV2.cpp \
-           dsp/tonal/ChangeDetectionFunction.cpp \
-           dsp/tonal/TCSgram.cpp \
-           dsp/tonal/TonalEstimator.cpp \
-           dsp/transforms/FFT.cpp \
-           dsp/wavelet/Wavelet.cpp \
-           hmm/hmm.c \
-           maths/Correlation.cpp \
-           maths/CosineDistance.cpp \
-           maths/KLDivergence.cpp \
-           maths/MathUtilities.cpp \
-           maths/pca/pca.c \
-           thread/Thread.cpp \
-           ext/kissfft/kiss_fft.c \
-           ext/kissfft/tools/kiss_fftr.c