summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2017-10-29 13:31:34 +1100
committerDamien Zammit <damien@zamaudio.com>2017-10-29 13:31:34 +1100
commit135493d835518e259f6e718ab7c9a3f8fcf8fdc5 (patch)
tree6c2f5ab5226c7d5fc3db135e6e3e4995794ed990 /plugins
parent45b1d009deb663e6ae27fbb092a1886e77d0653f (diff)
Bundle zita-convolver 3.1.0 and use instead of system lib
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.mk2
-rw-r--r--plugins/ZamVerb/Makefile3
-rw-r--r--plugins/ZamVerb/convolution.hpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk
index 2319f37..6b9728f 100644
--- a/plugins/Makefile.mk
+++ b/plugins/Makefile.mk
@@ -17,7 +17,7 @@ endif
TARGET_DIR = ../../bin
-BASE_FLAGS += -lzita-convolver -lsamplerate
+BASE_FLAGS += -lfftw3f -lpthread -lsamplerate
BUILD_C_FLAGS += -I.
BUILD_CXX_FLAGS += -I. -I.. -I../../dpf/distrho -I../../dpf/dgl
diff --git a/plugins/ZamVerb/Makefile b/plugins/ZamVerb/Makefile
index f7c5a02..cfa412c 100644
--- a/plugins/ZamVerb/Makefile
+++ b/plugins/ZamVerb/Makefile
@@ -15,7 +15,8 @@ NAME = ZamVerb
OBJS_DSP = \
ZamVerbPlugin.cpp.o \
ZamVerbImpulses.cpp.o \
- convolution.cpp.o
+ convolution.cpp.o \
+ ../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o
OBJS_UI = \
ZamVerbArtwork.cpp.o \
diff --git a/plugins/ZamVerb/convolution.hpp b/plugins/ZamVerb/convolution.hpp
index a730e29..4eeada5 100644
--- a/plugins/ZamVerb/convolution.hpp
+++ b/plugins/ZamVerb/convolution.hpp
@@ -19,7 +19,7 @@
#ifndef CONVOLUTION_H_
#define CONVOLUTION_H_
-#include <zita-convolver.h>
+#include "../../lib/zita-convolver-3.1.0/zita-convolver.h"
#define MAX_CHANNEL_MAPS (4)
#define VERBOSE_printf(x, ...)