X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=blobdiff_plain;f=Makefile.linux;h=dea3e58dcad84943f3bbe7851bb4152cec7eb472;hp=bb105b36b56fb29470a7bd0f7dd98a6a7420d763;hb=044ac79b634e0826dbb3e6463c677d4a8a6bb3f6;hpb=ca45c155c6b7416ab063d33bccbff707c6221df7

diff --git a/Makefile.linux b/Makefile.linux
index bb105b3..dea3e58 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -12,13 +12,20 @@
 # ... or for a release build
 CFLAGS		:= -Wall -Wextra -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC
 
+# use local static aubio, built with ./scripts/get_aubio.sh
+AUBIO_LDFLAGS := ./contrib/aubio/build/src/libaubio.a
+
 # Location of Vamp plugin SDK relative to the project directory
-VAMPSDK_DIR	:= ../vamp-plugin-sdk
+VAMPSDK_DIR	:= ./contrib/vamp-plugin-sdk-2.6
+
+# Location of libvamp-sdk.a
+VAMPBIN_DIR_LINUX64 ?= ./contrib/vamp-plugin-sdk-2.6-binaries-amd64-linux
+VAMPBIN_DIR_LINUX32 ?= ./contrib/vamp-plugin-sdk-2.6-binaries-i686-linux
 
 # Libraries and linker flags required by plugin: add any -l<library>
 # options here
-PLUGIN_LDFLAGS	:= -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
-PLUGIN_LIBS			:= $(VAMPSDK_DIR)/libvamp-sdk.a
+PLUGIN_LDFLAGS	:= $(AUBIO_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
+PLUGIN_LIBS			:= -L$(VAMPBIN_DIR_LINUX32) -L$(VAMPBIN_DIR_LINUX64) -lvamp-sdk
 
 # File extension for plugin library on this platform
 PLUGIN_EXT	:= .so