# HG changeset patch # User Chris Cannam # Date 1394016435 0 # Node ID 411c5c28fc43e701752756ba5c2dda4ebd570940 # Parent b26975f6a1f1a0140f8050ece2db033fdc99fd9a Makefiles, and build fix diff -r b26975f6a1f1 -r 411c5c28fc43 LowFreq.cpp --- a/LowFreq.cpp Mon Mar 03 16:35:27 2014 +0000 +++ b/LowFreq.cpp Wed Mar 05 10:47:15 2014 +0000 @@ -100,7 +100,6 @@ d.isQuantized = false; list.push_back(d); - ParameterDescriptor d; d.identifier = "p_long"; d.name = "Longest Period"; d.description = "Period in seconds of the lowest-frequency component to include in the spectrogram. That is, 1/f where f is the lowest frequency (in Hz) spanned by the spectrogram."; diff -r b26975f6a1f1 -r 411c5c28fc43 Makefile.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile.inc Wed Mar 05 10:47:15 2014 +0000 @@ -0,0 +1,43 @@ + +PLUGIN_EXT ?= .so + +CXX ?= g++ +CC ?= gcc + +CFLAGS := $(CFLAGS) +CXXFLAGS := -I. $(CXXFLAGS) + +PLUGIN := lowfreq$(PLUGIN_EXT) + +SOURCES := LowFreq.cpp + +PLUGIN_MAIN := plugins.cpp + +TESTS := + +OBJECTS := $(SOURCES:.cpp=.o) +OBJECTS := $(OBJECTS:.c=.o) + +PLUGIN_OBJECTS := $(OBJECTS) $(PLUGIN_MAIN:.cpp=.o) + +all: $(PLUGIN) $(TESTS) + for t in $(TESTS); do echo "Running $$t"; ./"$$t" || exit 1; done + +plugin: $(PLUGIN) + +$(PLUGIN): $(PLUGIN_OBJECTS) + $(CXX) -o $@ $^ $(PLUGIN_LDFLAGS) + +clean: + rm -f $(PLUGIN_OBJECTS) test/*.o + +distclean: clean + rm -f $(PLUGIN) $(TESTS) + +depend: + makedepend -Y -fMakefile.inc *.cpp test/*.cpp *.h test/*.h + +# DO NOT DELETE + +LowFreq.o: LowFreq.h +plugins.o: LowFreq.h diff -r b26975f6a1f1 -r 411c5c28fc43 Makefile.linux --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile.linux Wed Mar 05 10:47:15 2014 +0000 @@ -0,0 +1,13 @@ + +CFLAGS := -Wall -O3 -fPIC -I../vamp-plugin-sdk/ +#CFLAGS := -g -fPIC -I../vamp-plugin-sdk + +CXXFLAGS := $(CFLAGS) + +PLUGIN_LDFLAGS := -shared -Wl,-Bstatic -L../vamp-plugin-sdk -lvamp-sdk -Wl,-Bdynamic -Wl,--version-script=vamp-plugin.map +TEST_LDFLAGS := -Wl,-Bstatic -L../vamp-plugin-sdk -lvamp-sdk -Wl,-Bdynamic -lboost_unit_test_framework + +PLUGIN_EXT := .so + +include Makefile.inc +