From 13f81cd1af828f904988cd6657cb565ae969d1d9 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 23 May 2024 16:31:01 +0200 Subject: [PATCH] Fix build with updated dpf Signed-off-by: falkTX --- Makefile.mk2 | 4 ++++ distrho-3bandeq.cpp | 3 +++ distrho-3bandsplitter.cpp | 3 +++ distrho-nekobi.cpp | 3 +++ distrho-pingpongpan.cpp | 3 +++ distrho-vectorjuice.cpp | 3 +++ distrho-wobblejuice.cpp | 3 +++ 7 files changed, 22 insertions(+) diff --git a/Makefile.mk2 b/Makefile.mk2 index 0c6c7c2..94ca478 100644 --- a/Makefile.mk2 +++ b/Makefile.mk2 @@ -35,6 +35,10 @@ OBJS += \ DPF_FLAGS += -DSTATIC_BUILD DPF_FLAGS += -UDONT_SET_USING_DGL_NAMESPACE +ifeq ($(MACOS),true) +DPF_FLAGS += -ObjC++ +endif + # --------------------------------------------------------------------------------------------------------------------- # ZynAddSubFX diff --git a/distrho-3bandeq.cpp b/distrho-3bandeq.cpp index 4cac556..876356f 100644 --- a/distrho-3bandeq.cpp +++ b/distrho-3bandeq.cpp @@ -38,6 +38,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO diff --git a/distrho-3bandsplitter.cpp b/distrho-3bandsplitter.cpp index 2e96928..54c0d10 100644 --- a/distrho-3bandsplitter.cpp +++ b/distrho-3bandsplitter.cpp @@ -38,6 +38,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO diff --git a/distrho-nekobi.cpp b/distrho-nekobi.cpp index 029f48d..e35d210 100644 --- a/distrho-nekobi.cpp +++ b/distrho-nekobi.cpp @@ -37,6 +37,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO diff --git a/distrho-pingpongpan.cpp b/distrho-pingpongpan.cpp index ad9807c..53a6fad 100644 --- a/distrho-pingpongpan.cpp +++ b/distrho-pingpongpan.cpp @@ -38,6 +38,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO diff --git a/distrho-vectorjuice.cpp b/distrho-vectorjuice.cpp index 2739b7e..01e65dc 100644 --- a/distrho-vectorjuice.cpp +++ b/distrho-vectorjuice.cpp @@ -38,6 +38,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO diff --git a/distrho-wobblejuice.cpp b/distrho-wobblejuice.cpp index 88ecdd8..7e9c2f3 100644 --- a/distrho-wobblejuice.cpp +++ b/distrho-wobblejuice.cpp @@ -38,6 +38,9 @@ #include "DistrhoPluginMain.cpp" #if DISTRHO_PLUGIN_HAS_UI #include "DistrhoUIMain.cpp" +#ifdef CARLA_OS_MAC +#include "DistrhoUI_macOS.mm" +#endif #endif START_NAMESPACE_DISTRHO