Mercurial > hg > vamp-aubio-plugins
changeset 41:b221ebf3c592
Update for local subrepo aubio build
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Tue, 04 Dec 2012 17:36:47 +0000 |
| parents | c21d294cb5ca |
| children | bd6f1ebf39d5 |
| files | Makefile config.h |
| diffstat | 2 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Dec 04 17:27:27 2012 +0000 +++ b/Makefile Tue Dec 04 17:36:47 2012 +0000 @@ -3,15 +3,19 @@ # PLUGINDIR = plugins +# Location of aubio code +# +AUBIODIR = aubio + # Compile flags # -#CXXFLAGS := -I../ -I../inst/include $(CXXFLAGS) -fPIC -DNDEBUG -O2 -Wall -I. -CXXFLAGS := -I../ -I../inst/include $(CXXFLAGS) -fPIC -DDEBUG -g -Wall -I. +CFLAGS := -I. -Iaubio/src $(CFLAGS) -fPIC -DDEBUG -g -Wall -I. +CXXFLAGS := $(CFLAGS) # Libraries required for the plugins. # #PLUGIN_LIBS = -L../inst/lib -lvamp-sdk -laubio -PLUGIN_LIBS = ../vamp-plugin-sdk/libvamp-sdk.a /usr/local/lib/libaubio.a /usr/lib/libfftw3f.a +PLUGIN_LIBS = -Wl,-Bstatic -lvamp-sdk -lfftw3f -Wl,-Bdynamic # Flags required to tell the compiler to make a dynamically loadable object # @@ -29,13 +33,14 @@ ### End of user-serviceable parts PLUGIN_OBJECTS = libmain.o $(patsubst %.cpp,%.o,$(wildcard $(PLUGINDIR)/*.cpp)) +AUBIO_OBJECTS = $(patsubst %.c,%.o,$(wildcard $(AUBIODIR)/src/*.c $(AUBIODIR)/src/*/*.c )) PLUGIN_HEADERS = $(patsubst %.cpp,%.h,$(wildcard $(PLUGINDIR)/*.cpp)) PLUGIN_TARGET = vamp-aubio$(PLUGIN_EXT) all: $(PLUGIN_TARGET) -$(PLUGIN_TARGET): $(PLUGIN_OBJECTS) $(PLUGIN_HEADERS) - $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS) +$(PLUGIN_TARGET): $(PLUGIN_OBJECTS) $(AUBIO_OBJECTS) $(PLUGIN_HEADERS) + $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(AUBIO_OBJECTS) $(PLUGIN_LIBS) clean: rm -f $(PLUGIN_OBJECTS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config.h Tue Dec 04 17:36:47 2012 +0000 @@ -0,0 +1,15 @@ + +#define HAVE_FFTW3 1 +#define HAVE_FFTW3F 1 + +#define HAVE_C99_VARARGS_MACROS 1 + +#define HAVE_LIBM 1 +#define HAVE_LIMITS_H 1 +#define HAVE_MATH_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDIO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1