changeset 124:7117c36b790d

Makefile.linux: update
author Paul Brossier <piem@piem.org>
date Fri, 22 Jul 2016 00:20:37 +0200
parents 9b3f860ee2d8
children 4a10417c18d6
files Makefile.linux
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.linux	Fri Jul 22 00:17:40 2016 +0200
+++ b/Makefile.linux	Fri Jul 22 00:20:37 2016 +0200
@@ -11,8 +11,9 @@
 
 # ... or for a release build
 CFLAGS		:= -Wall -Wextra -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC
-CFLAGS += -I./contrib/aubio-dist/include
-LDFLAGS += -L./contrib/aubio-dist/lib
+
+# 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	:= ./contrib/vamp-plugin-sdk-2.6
@@ -23,7 +24,7 @@
 
 # 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_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