From de4b1705a5ae0e6a44a5d4abe44333ef591e99ee Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 9 Jun 2023 14:57:56 +0200 Subject: [PATCH] make sure juce hosting is not attempted in bridge builds Signed-off-by: falkTX --- source/bridges-plugin/Makefile | 1 - source/modules/AppConfig.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index 0095fdeae..eab9c7889 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -206,7 +206,6 @@ OBJS_arch = \ $(OBJDIR)/CarlaPluginVST2.cpp.arch.o \ $(OBJDIR)/CarlaPluginVST3.cpp.arch.o \ $(OBJDIR)/CarlaPluginAU.cpp.arch.o \ - $(OBJDIR)/CarlaPluginJuce.cpp.arch.o \ $(OBJDIR)/CarlaStandalone.cpp.arch.o OBJS_arm32 = $(OBJS_arch:%.arch.o=%.arm32.o) diff --git a/source/modules/AppConfig.h b/source/modules/AppConfig.h index 2bf78de37..f8e235fed 100644 --- a/source/modules/AppConfig.h +++ b/source/modules/AppConfig.h @@ -218,7 +218,7 @@ @see VSTPluginFormat, AudioPluginFormat, AudioPluginFormatManager, JUCE_PLUGINHOST_AU */ -#if defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN) +#if (defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN)) && !defined(BUILD_BRIDGE) # define JUCE_PLUGINHOST_VST 1 #else # define JUCE_PLUGINHOST_VST 0 @@ -230,7 +230,7 @@ @see VSTPluginFormat, VST3PluginFormat, AudioPluginFormat, AudioPluginFormatManager, JUCE_PLUGINHOST_VST, JUCE_PLUGINHOST_AU */ -#if defined(APPCONFIG_OS_LINUX) || defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN) +#if (defined(APPCONFIG_OS_MAC) || defined(APPCONFIG_OS_WIN)) && !defined(BUILD_BRIDGE) # define JUCE_PLUGINHOST_VST3 1 #else # define JUCE_PLUGINHOST_VST3 0