From 83045e57cb06e70ed24099191e08f23f42374ef3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 22 Oct 2022 03:09:37 +0100
Subject: [PATCH] Implement CLAP multi-IO, enable main variant for it

Signed-off-by: falkTX <falktx@falktx.com>
---
 carla                    |  2 +-
 dpf                      |  2 +-
 plugins/Makefile         | 12 +++++++++++-
 src/Makefile.cardinal.mk | 10 +++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/carla b/carla
index dc9b58b..b27f20c 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit dc9b58b4cb148f5f38654defe19b1fe2556acc21
+Subproject commit b27f20cc303369d71d3e548567593afce925433c
diff --git a/dpf b/dpf
index ac3f5bc..57fcfca 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit ac3f5bce433a5ffbc083d3c62d30eefec8ffd1ec
+Subproject commit 57fcfcaf07f8dced0f643aff46bd0d3bb1b0b476
diff --git a/plugins/Makefile b/plugins/Makefile
index b80bc7a..69919a4 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1252,8 +1252,10 @@ VST2_RESOURCES  = $(PLUGIN_LIST:%=../bin/CardinalFX.vst/Contents/Resources/Plugi
 VST2_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalSynth.vst/Contents/Resources/PluginManifests/%.json)
 VST2_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalFX.vst/Contents/Resources/%)
 VST2_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalSynth.vst/Contents/Resources/%)
-CLAP_RESOURCES  = $(PLUGIN_LIST:%=../bin/CardinalFX.clap/Contents/Resources/PluginManifests/%.json)
+CLAP_RESOURCES  = $(PLUGIN_LIST:%=../bin/Cardinal.clap/Contents/Resources/PluginManifests/%.json)
+CLAP_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.clap/Contents/Resources/PluginManifests/%.json)
 CLAP_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalSynth.clap/Contents/Resources/PluginManifests/%.json)
+CLAP_RESOURCES += $(RESOURCE_FILES:%=../bin/Cardinal.clap/Contents/Resources/%)
 CLAP_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalFX.clap/Contents/Resources/%)
 CLAP_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalSynth.clap/Contents/Resources/%)
 else
@@ -1353,6 +1355,10 @@ ifeq ($(MACOS),true)
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
+../bin/Cardinal.clap/Contents/Resources/%: %
+	-@mkdir -p "$(shell dirname $@)"
+	$(SILENT)ln -sf $(abspath $<) $@
+
 ../bin/CardinalFX.clap/Contents/Resources/%: %
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
@@ -1361,6 +1367,10 @@ ifeq ($(MACOS),true)
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
+../bin/Cardinal.clap/Contents/Resources/PluginManifests/%.json: %/plugin.json
+	-@mkdir -p "$(shell dirname $@)"
+	$(SILENT)ln -sf $(abspath $<) $@
+
 ../bin/CardinalFX.clap/Contents/Resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 40d3351..938a3ae 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -157,6 +157,12 @@ CORE_RESOURCES += $(subst ../Rack/res/,,$(wildcard ../Rack/res/ComponentLibrary/
 LV2_RESOURCES   = $(CORE_RESOURCES:%=$(TARGET_DIR)/$(NAME).lv2/resources/%)
 VST3_RESOURCES  = $(CORE_RESOURCES:%=$(TARGET_DIR)/$(NAME).vst3/Contents/Resources/%)
 
+ifeq ($(MACOS),true)
+CLAP_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/$(NAME).clap/Contents/Resources/%)
+else
+CLAP_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.clap/resources/%)
+endif
+
 # Install modgui resources if MOD build
 ifeq ($(MOD_BUILD),true)
 LV2_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/Plateau_Reverb.ttl
@@ -169,10 +175,8 @@ endif
 ifneq ($(CARDINAL_VARIANT),main)
 ifeq ($(MACOS),true)
 VST2_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/$(NAME).vst/Contents/Resources/%)
-CLAP_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/$(NAME).clap/Contents/Resources/%)
 else
 VST2_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.vst/resources/%)
-CLAP_RESOURCES = $(CORE_RESOURCES:%=$(TARGET_DIR)/Cardinal.clap/resources/%)
 endif
 endif
 
@@ -357,7 +361,7 @@ BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"'
 # Enable all possible plugin types and setup resources
 
 ifeq ($(CARDINAL_VARIANT),main)
-TARGETS = lv2 vst3
+TARGETS = lv2 vst3 clap
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif