From ba760be01d17a4afb63465b7c9aebc53934817ae Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Fri, 9 Sep 2022 11:58:46 +0100
Subject: [PATCH] Add CLAP synth variant, WIP

---
 .github/workflows/build.yml |  2 +-
 dpf                         |  2 +-
 plugins/Makefile            | 24 +++++++++++++++++-------
 src/Makefile.cardinal.mk    |  7 +------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 728d978..76f7785 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ env:
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
   LIBGL_ALWAYS_SOFTWARE: 'true'
-  WITH_LTO: 'true'
+  WITH_LTO: 'false'
 
 jobs:
   linux-arm64:
diff --git a/dpf b/dpf
index 11a0877..4d37a8e 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 11a0877fd5c289e8b2e770491c63548eca489d3b
+Subproject commit 4d37a8e3011b1d04f71edbff572454b103cbdabf
diff --git a/plugins/Makefile b/plugins/Makefile
index 7e9682b..439d0ff 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1249,7 +1249,9 @@ VST2_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalSynth.vst/Contents/Resources/Pl
 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/CardinalSynth.clap/Contents/Resources/PluginManifests/%.json)
 CLAP_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalFX.clap/Contents/Resources/%)
+CLAP_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalSynth.clap/Contents/Resources/%)
 else
 VST2_RESOURCES  = $(PLUGIN_LIST:%=../bin/Cardinal.vst/resources/PluginManifests/%.json)
 VST2_RESOURCES += $(RESOURCE_FILES:%=../bin/Cardinal.vst/resources/%)
@@ -1335,10 +1337,6 @@ ifeq ($(MACOS),true)
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
-../bin/CardinalFX.clap/Contents/Resources/%: %
-	-@mkdir -p "$(shell dirname $@)"
-	$(SILENT)ln -sf $(abspath $<) $@
-
 ../bin/CardinalSynth.vst/Contents/Resources/%: %
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
@@ -1347,11 +1345,23 @@ ifeq ($(MACOS),true)
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
+../bin/CardinalSynth.vst/Contents/Resources/PluginManifests/%.json: %/plugin.json
+	-@mkdir -p "$(shell dirname $@)"
+	$(SILENT)ln -sf $(abspath $<) $@
+
+../bin/CardinalFX.clap/Contents/Resources/%: %
+	-@mkdir -p "$(shell dirname $@)"
+	$(SILENT)ln -sf $(abspath $<) $@
+
+../bin/CardinalSynth.clap/Contents/Resources/%: %
+	-@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 $<) $@
 
-../bin/CardinalSynth.vst/Contents/Resources/PluginManifests/%.json: %/plugin.json
+../bin/CardinalSynth.clap/Contents/Resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 else
@@ -1359,11 +1369,11 @@ else
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
-../bin/Cardinal.clap/resources/%: %
+../bin/Cardinal.vst/resources/PluginManifests/%.json: %/plugin.json
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
-../bin/Cardinal.vst/resources/PluginManifests/%.json: %/plugin.json
+../bin/Cardinal.clap/resources/%: %
 	-@mkdir -p "$(shell dirname $@)"
 	$(SILENT)ln -sf $(abspath $<) $@
 
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 19c1218..05901e3 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -360,12 +360,7 @@ endif
 else ifeq ($(CARDINAL_VARIANT),native)
 TARGETS = jack
 else
-TARGETS = lv2 vst2 vst3 static
-endif
-
-# TESTING
-ifeq ($(CARDINAL_VARIANT),fx)
-TARGETS += clap
+TARGETS = lv2 vst2 vst3 clap static
 endif
 
 all: $(TARGETS)