Mercurial > hg > vamp-libxtract-plugins

changeset 22:64b85e38dd52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add config file & update for libxtract-as-subrepo
author Chris Cannam
date Tue, 04 Dec 2012 15:51:33 +0000
parents f240e8304984
children 2973778e604f
files Makefile config.h plugins/XTractPlugin.cpp
diffstat 3 files changed, 18 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Dec 04 14:58:03 2012 +0000
+++ b/Makefile	Tue Dec 04 15:51:33 2012 +0000
@@ -3,13 +3,18 @@
 #
 PLUGINDIR	= plugins
 
+# Location of LibXtract
+#
+LIBXTRACTDIR	= LibXtract
+
 # Compile flags
 #
-CXXFLAGS	:= $(CXXFLAGS) -DNDEBUG -O3 -ffast-math -Wall -fPIC -I.
+CFLAGS		:= $(CFLAGS) -DXTRACT_FFT=1 -DNDEBUG -O3 -ffast-math -Wall -fPIC -I. -I$(LIBXTRACTDIR)
+CXXFLAGS	:= $(CFLAGS) 
 
 # Libraries required for the plugins.
 #
-PLUGIN_LIBS	= -Wl,-Bstatic -lvamp-sdk -lxtract -lfftw3f -Wl,-Bdynamic
+PLUGIN_LIBS	= -Wl,-Bstatic -lvamp-sdk -lfftw3f -Wl,-Bdynamic
 
 # Flags required to tell the compiler to make a dynamically loadable object
 #
@@ -27,16 +32,17 @@
 ### End of user-serviceable parts
 
 PLUGIN_OBJECTS	= libmain.o $(patsubst %.cpp,%.o,$(wildcard $(PLUGINDIR)/*.cpp))
+XTRACT_OBJECTS	= $(patsubst %.c,%.o,$(wildcard $(LIBXTRACTDIR)/src/*.c))
 PLUGIN_HEADERS	= $(patsubst %.cpp,%.h,$(wildcard $(PLUGINDIR)/*.cpp))
 PLUGIN_TARGET	= vamp-libxtract$(PLUGIN_EXT)
 
 all:		$(PLUGIN_TARGET)
 
-$(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(PLUGIN_HEADERS)
-		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
+$(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(XTRACT_OBJECTS) $(PLUGIN_HEADERS)
+		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(XTRACT_OBJECTS) $(PLUGIN_LIBS)
 
 clean:		
-		rm -f $(PLUGIN_OBJECTS)
+		rm -f $(PLUGIN_OBJECTS) $(XTRACT_OBJECTS)
 
 distclean:	clean
 		rm -f $(PLUGIN_TARGET) *~ */*~
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.h	Tue Dec 04 15:51:33 2012 +0000
@@ -0,0 +1,6 @@
+
+/* Configure header for libxtract when building for use in Vamp plugin */
+
+#define BUILD_FFT 1
+#define XTRACT_FFT_OPTIMISATION_LEVEL 1
+
--- a/plugins/XTractPlugin.cpp	Tue Dec 04 14:58:03 2012 +0000
+++ b/plugins/XTractPlugin.cpp	Tue Dec 04 15:51:33 2012 +0000
@@ -17,6 +17,7 @@
 #include "XTractPlugin.h"
 
 #include <cassert>
+#include <cstdio>
 #include <math.h>