From b9a7aaa58745d51937a36080e532093b6a212945 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 21 Oct 2021 12:13:00 +0100 Subject: [PATCH] Fix build after latest changes Signed-off-by: falkTX --- Makefile.plugins.mk | 6 +++++- distrho/DistrhoUIMain.cpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index 050f71e5..666cb89e 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -51,7 +51,6 @@ JACK_LIBS += -framework CoreAudio -framework CoreFoundation else ifeq ($(WINDOWS),true) JACK_LIBS += -lksuser -lmfplat -lmfuuid -lole32 -lwinmm -lwmcodecdspuuid else ifneq ($(HAIKU),true) -JACK_LIBS = -ldl ifeq ($(HAVE_ALSA),true) JACK_FLAGS += $(ALSA_FLAGS) JACK_LIBS += $(ALSA_LIBS) @@ -68,6 +67,11 @@ endif # backwards compat BASE_FLAGS += -DHAVE_JACK +# always needed +ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true) +LINK_FLAGS += -ldl +endif + # --------------------------------------------------------------------------------------------------------------------- # Set VST3 filename, see https://vst3sdk-doc.diatonic.jp/doc/vstinterfaces/vst3loc.html diff --git a/distrho/DistrhoUIMain.cpp b/distrho/DistrhoUIMain.cpp index 0751bbb8..f186e6a5 100644 --- a/distrho/DistrhoUIMain.cpp +++ b/distrho/DistrhoUIMain.cpp @@ -32,8 +32,8 @@ # error unsupported format #endif -#if !DISTRHO_PLUGIN_WANT_DIRECT_ACCESS -# if defined(DISTRHO_PLUGIN_TARGET_JACK) || defined(DISTRHO_PLUGIN_TARGET_DSSI) +#if !DISTRHO_PLUGIN_WANT_DIRECT_ACCESS && !DISTRHO_PLUGIN_TARGET_JACK && !DISTRHO_PLUGIN_TARGET_VST2 && !DISTRHO_PLUGIN_TARGET_VST3 +# ifdef DISTRHO_PLUGIN_TARGET_DSSI # define DISTRHO_IS_STANDALONE 1 # else # define DISTRHO_IS_STANDALONE 0