From c23230297c8ab59c6b5c8e79184c928b691bf187 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 29 Dec 2022 02:06:09 +0000
Subject: [PATCH] Build mini variant for MOD

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml        | 6 +++---
 dpf                                | 2 +-
 src/CardinalFX/DistrhoPluginInfo.h | 9 ++-------
 src/CardinalMini/Makefile          | 3 +--
 src/Makefile                       | 1 +
 src/Makefile.cardinal.mk           | 8 +++++++-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1cf7885..efda263 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -660,7 +660,7 @@ jobs:
       - name: Build for modduo
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make modduo HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} MODDUO=true -j $(nproc)
+          make modduo CIBUILD=true HEADLESS=true MODDUO=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -702,7 +702,7 @@ jobs:
       - name: Build for modduox
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make modduox HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
+          make modduox CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -744,7 +744,7 @@ jobs:
       - name: Build for moddwarf
         if: steps.mpb-cache.outputs.cache-hit == 'true'
         run: |
-          make moddwarf HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
+          make moddwarf CIBUILD=true HEADLESS=true WITH_LTO=${{ env.WITH_LTO }} -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
diff --git a/dpf b/dpf
index 48c4ebf..55ab560 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 48c4ebf27baaf9c039209df1443013dc977e0819
+Subproject commit 55ab560e3cf8c408cd7e36d847cf2c1a34cf59e5
diff --git a/src/CardinalFX/DistrhoPluginInfo.h b/src/CardinalFX/DistrhoPluginInfo.h
index 3a94d84..48d6c84 100644
--- a/src/CardinalFX/DistrhoPluginInfo.h
+++ b/src/CardinalFX/DistrhoPluginInfo.h
@@ -31,13 +31,8 @@
 #define DISTRHO_PLUGIN_URI     "https://distrho.kx.studio/plugins/cardinal#fx"
 #define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.cardinal#fx"
 
-#if defined(__MOD_DEVICES__)
-# define DISTRHO_PLUGIN_NAME  "Cardinal Mini"
-# define DISTRHO_PLUGIN_LABEL "CardinalMini"
-#else
-# define DISTRHO_PLUGIN_NAME  "Cardinal FX"
-# define DISTRHO_PLUGIN_LABEL "CardinalFX"
-#endif
+#define DISTRHO_PLUGIN_NAME  "Cardinal FX"
+#define DISTRHO_PLUGIN_LABEL "CardinalFX"
 
 #ifdef HEADLESS
 #define DISTRHO_PLUGIN_HAS_UI             0
diff --git a/src/CardinalMini/Makefile b/src/CardinalMini/Makefile
index fa53a8e..a616d22 100644
--- a/src/CardinalMini/Makefile
+++ b/src/CardinalMini/Makefile
@@ -5,6 +5,5 @@
 #
 
 NAME = CardinalMini
-PLUGIN_CLASS = distrho_cardinal_mini
-PLUGIN_URI = https://distrho.kx.studio/plugins/cardinal\#mini
+MODGUI_CLASS_NAME = distrho_cardinal_mini
 include ../Makefile.cardinal.mk
diff --git a/src/Makefile b/src/Makefile
index c0b8b3b..f8b4a34 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -232,6 +232,7 @@ all: $(TARGETS)
 ifeq ($(MOD_BUILD),true)
 	$(MAKE) -C Cardinal lv2
 	$(MAKE) -C CardinalFX lv2
+	$(MAKE) -C CardinalMini lv2
 else ifeq ($(WASM),true)
 	$(MAKE) -C CardinalNative
 # 	$(MAKE) -C CardinalMini modgui
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 0259c85..eaf683e 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -303,7 +303,13 @@ BASE_FLAGS += -DCARDINAL_NOSIMD
 endif
 
 ifeq ($(MOD_BUILD),true)
-BASE_FLAGS += -DDISTRHO_PLUGIN_USES_MODGUI=1 -DDISTRHO_PLUGIN_MINIMUM_BUFFER_SIZE=0xffff
+BASE_FLAGS += -DDISTRHO_PLUGIN_MINIMUM_BUFFER_SIZE=0xffff
+BASE_FLAGS += -DDISTRHO_PLUGIN_USES_MODGUI=1
+ifeq ($(CARDINAL_VARIANT),mini)
+BASE_FLAGS += -DDISTRHO_PLUGIN_USES_CUSTOM_MODGUI=0
+else
+BASE_FLAGS += -DDISTRHO_PLUGIN_USES_CUSTOM_MODGUI=1
+endif
 endif
 
 ifneq ($(WASM),true)