diff --git a/source/discovery/Makefile b/source/discovery/Makefile index 89523a7d6..dbe80b2fe 100644 --- a/source/discovery/Makefile +++ b/source/discovery/Makefile @@ -14,6 +14,11 @@ BUILD_CXX_FLAGS += -I../includes/ladspa -I../includes/vst -I../includes/vst3 ifeq ($(MACOS),true) BUILD_CXX_FLAGS += -ObjC++ +WANT_JUCE_PROCESSORS = true +endif + +ifeq ($(WIN32),true) +WANT_JUCE_PROCESSORS = true endif BUILD_CXX_FLAGS += $(QTCORE_FLAGS) @@ -69,6 +74,10 @@ LIBS_win64 += ../modules/juce_core.win64.a LINK_FLAGS += $(JUCE_CORE_LIBS) $(JUCE_AUDIO_BASICS_LIBS) endif +ifeq ($(WANT_JUCE_PROCESSORS),true) +LIBS += ../modules/juce_audio_processors.a +endif + POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS) POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu diff --git a/source/modules/juce_audio_processors/Makefile b/source/modules/juce_audio_processors/Makefile index 7bfdd568f..f5629bffa 100644 --- a/source/modules/juce_audio_processors/Makefile +++ b/source/modules/juce_audio_processors/Makefile @@ -13,6 +13,13 @@ LINK_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS) -L.. -ljuce_audio_basics -ljuce ifeq ($(CARLA_VESTIGE_HEADER),true) BUILD_CXX_FLAGS += -DVESTIGE_HEADER +else +# needed by vst3 +ifeq ($(DEBUG),true) +BUILD_CXX_FLAGS += -DDEVELOPMENT -D_DEBUG +else +BUILD_CXX_FLAGS += -DRELEASE +endif endif ifeq ($(MACOS),true) diff --git a/source/utils/CarlaVstUtils.hpp b/source/utils/CarlaVstUtils.hpp index e885bb860..77b4c183b 100644 --- a/source/utils/CarlaVstUtils.hpp +++ b/source/utils/CarlaVstUtils.hpp @@ -127,8 +127,8 @@ struct VstTimeInfo_R { # define TARGET_API_MAC_CARBON 0 #endif #undef VST_64BIT_PLATFORM -#define VST_64BIT_PLATFORM defined(_WIN64) || defined(__LP64__) || defined (_LP64) -#include "vst/aeffectx.h" +#define VST_64BIT_PLATFORM (defined(_WIN64) || defined(__LP64__) || defined (_LP64)) +#include "vst/pluginterfaces/vst2.x/aeffectx.h" typedef VstTimeInfo VstTimeInfo_R; #endif