diff options
Diffstat (limited to 'plugins/ZamVerb')
| -rw-r--r-- | plugins/ZamVerb/Makefile | 12 | ||||
| -rw-r--r-- | plugins/ZamVerb/convolution.cpp | 1 | ||||
| -rw-r--r-- | plugins/ZamVerb/convolution.hpp | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/plugins/ZamVerb/Makefile b/plugins/ZamVerb/Makefile index eacc080..a08e334 100644 --- a/plugins/ZamVerb/Makefile +++ b/plugins/ZamVerb/Makefile @@ -15,8 +15,11 @@ NAME = ZamVerb OBJS_DSP = \ ZamVerbPlugin.cpp.o \ ZamVerbImpulses.cpp.o \ - convolution.cpp.o \ - ../../lib/zita-convolver-4.0.0/zita-convolver.cpp.o + convolution.cpp.o + +ifneq ($(HAVE_ZITA_CONVOLVER),true) +OBJS_DSP += ../../lib/zita-convolver-4.0.0/zita-convolver.cpp.o +endif OBJS_UI = \ ZamVerbArtwork.cpp.o \ @@ -39,6 +42,11 @@ else TARGETS += lv2_dsp endif +ifeq ($(HAVE_ZITA_CONVOLVER),true) +BASE_FLAGS += -DHAVE_ZITA_CONVOLVER +LINK_FLAGS += $(ZITA_CONVOLVER_LIBS) +endif + TARGETS += vst all: $(TARGETS) diff --git a/plugins/ZamVerb/convolution.cpp b/plugins/ZamVerb/convolution.cpp index 27374e0..8357037 100644 --- a/plugins/ZamVerb/convolution.cpp +++ b/plugins/ZamVerb/convolution.cpp @@ -42,7 +42,6 @@ #include <pthread.h> #include <assert.h> -#include "../../lib/zita-convolver-4.0.0/zita-convolver.h" #include <samplerate.h> #include "convolution.hpp" #include "ZamVerbImpulses.hpp" diff --git a/plugins/ZamVerb/convolution.hpp b/plugins/ZamVerb/convolution.hpp index 1c89971..cfb3755 100644 --- a/plugins/ZamVerb/convolution.hpp +++ b/plugins/ZamVerb/convolution.hpp @@ -19,7 +19,11 @@ #ifndef CONVOLUTION_H_ #define CONVOLUTION_H_ +#ifdef HAVE_ZITA_CONVOLVER +#include <zita-convolver.h> +#else #include "../../lib/zita-convolver-4.0.0/zita-convolver.h" +#endif #define MAX_CHANNEL_MAPS (4) #define VERBOSE_printf(x, ...) |