Mercurial > hg > segmenter-vamp-plugin
changeset 51:67bf860c0b4b
changed makefiles (mainly adding some more sources to the .inc file)
| author | matthiasm |
|---|---|
| date | Thu, 13 Jun 2013 11:39:16 +0100 |
| parents | 413c4582824a |
| children | da969f4d9de4 |
| files | Makefile.inc Makefile.osx segmentino/Segmentino.cpp |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Thu Jun 13 11:24:03 2013 +0100 +++ b/Makefile.inc Thu Jun 13 11:39:16 2013 +0100 @@ -23,6 +23,9 @@ qm-dsp/dsp/tempotracking/TempoTrackV2.cpp \ qm-dsp/dsp/tempotracking/DownBeat.cpp \ qm-dsp/dsp/phasevocoder/PhaseVocoder.cpp \ + qm-dsp/dsp/signalconditioning/DFProcess.cpp \ + qm-dsp/dsp/signalconditioning/FiltFilt.cpp \ + qm-dsp/dsp/signalconditioning/Filter.cpp \ qm-dsp/maths/MathUtilities.cpp OBJECTS := $(SOURCES:.cpp=.o)
--- a/Makefile.osx Thu Jun 13 11:24:03 2013 +0100 +++ b/Makefile.osx Thu Jun 13 11:39:16 2013 +0100 @@ -1,11 +1,10 @@ -CFLAGS := -O3 -ftree-vectorize -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -I../vamp-plugin-sdk -I/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/ -DUSE_PTHREADS - +CFLAGS := -O3 -ftree-vectorize -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -arch i386 -arch x86_64 -I/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/ -Ivamp-plugin-sdk -Iqm-dsp -I../boost_1_48_0 CXXFLAGS := $(CFLAGS) -LDFLAGS := -isysroot /Developer/SDKs/MacOSX10.7.sdk -arch i386 -arch x86_64 -dynamiclib -framework Accelerate -lpthread -install_name qm-vamp-plugins.dylib +LDFLAGS := -isysroot /Developer/SDKs/MacOSX10.7.sdk -L/usr/lib/ -arch i386 -arch x86_64 -dynamiclib -install_name qm-vamp-plugins.dylib PLUGIN_EXT := .dylib -include build/general/Makefile.inc +include Makefile.inc
--- a/segmentino/Segmentino.cpp Thu Jun 13 11:24:03 2013 +0100 +++ b/segmentino/Segmentino.cpp Thu Jun 13 11:39:16 2013 +0100 @@ -547,7 +547,7 @@ beat.sampleType = OutputDescriptor::VariableSampleRate; beat.sampleRate = 1.0 / m_stepSecs; m_beatOutputNumber = outputCounter++; - + OutputDescriptor bars; bars.identifier = "bars"; bars.name = "Bars"; @@ -558,7 +558,7 @@ bars.sampleType = OutputDescriptor::VariableSampleRate; bars.sampleRate = 1.0 / m_stepSecs; m_barsOutputNumber = outputCounter++; - + OutputDescriptor beatcounts; beatcounts.identifier = "beatcounts"; beatcounts.name = "Beat Count"; @@ -569,7 +569,7 @@ beatcounts.sampleType = OutputDescriptor::VariableSampleRate; beatcounts.sampleRate = 1.0 / m_stepSecs; m_beatcountsOutputNumber = outputCounter++; - + OutputDescriptor beatsd; beatsd.identifier = "beatsd"; beatsd.name = "Beat Spectral Difference";