From: Paul Brossier Date: Thu, 21 Jul 2016 21:41:06 +0000 (+0200) Subject: Makefile.linux: use same locations as for scripts/get_aubio.sh, scripts/get_deps* X-Git-Tag: 0.5.1~70 X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=e58392f4dc5f0547711470d8f74842c074458392;p=vamp-aubio-plugins.git Makefile.linux: use same locations as for scripts/get_aubio.sh, scripts/get_deps* --- diff --git a/Makefile.linux b/Makefile.linux index 01b6fe8..be2e140 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -11,13 +11,15 @@ # ... 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 # Location of Vamp plugin SDK relative to the project directory -VAMPSDK_DIR := ../vamp-plugin-sdk-2.5 +VAMPSDK_DIR := ./contrib/vamp-plugin-sdk-2.6 # Location of libvamp-sdk.a -VAMPBIN_DIR_LINUX64 ?= ../vamp-plugin-sdk-2.5-binaries-amd64-linux -VAMPBIN_DIR_LINUX32 ?= ../vamp-plugin-sdk-2.5-binaries-i686-linux +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 # options here