From 0e43d41645b061c2d9f3904fa16425b1f44d3ce8 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 19 Mar 2022 22:15:10 +0000
Subject: [PATCH] Fixes to get it building and running again after module
 updates

Signed-off-by: falkTX <falktx@falktx.com>
---
 plugins/LyraeModules |  2 +-
 plugins/Makefile     | 18 ++++++++++++++++--
 plugins/plugins.cpp  |  5 ++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/LyraeModules b/plugins/LyraeModules
index a239b82..b21cbe8 160000
--- a/plugins/LyraeModules
+++ b/plugins/LyraeModules
@@ -1 +1 @@
-Subproject commit a239b823cea2bbde28ae2a9299f51f01c95b7b93
+Subproject commit b21cbe8ee25ddf2a927e0b4ec9f2c97c115857af
diff --git a/plugins/Makefile b/plugins/Makefile
index db2289e..ab9c9d6 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -431,7 +431,7 @@ BEFACO_CUSTOM = ADSR Mixer
 # --------------------------------------------------------------
 # Bidoo
 
-PLUGIN_FILES += $(filter-out Bidoo/src/plugin.cpp Bidoo/src/ANTN.cpp,$(wildcard Bidoo/src/*.cpp))
+PLUGIN_FILES += $(filter-out Bidoo/src/ANTN.cpp,$(wildcard Bidoo/src/*.cpp))
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/*.cpp)
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp)
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp)
@@ -439,7 +439,7 @@ PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp)
 PLUGIN_FILES += $(filter-out Bidoo/src/dep/resampler/main.cpp,$(wildcard Bidoo/src/dep/resampler/*.cpp))
 
 # modules/types which are present in other plugins
-BIDOO_CUSTOM = ChannelDisplay LadderFilter $(DRWAV)
+BIDOO_CUSTOM = ChannelDisplay InstantiateExpanderItem LadderFilter $(DRWAV)
 BIDOO_CUSTOM_PER_FILE = channel channel filterType
 
 # --------------------------------------------------------------
@@ -1295,6 +1295,20 @@ $(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp
 		$(foreach m,$(BEFACO_CUSTOM),$(call custom_module_names,$(m),Befaco)) \
 		-DpluginInstance=pluginInstance__Befaco
 
+$(BUILD_DIR)/Bidoo/src/plugin.cpp.o: Bidoo/src/plugin.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(BIDOO_CUSTOM),$(call custom_module_names,$(m),Bidoo)) \
+		-DpluginInstance=pluginInstance__Bidoo \
+		-Dinit=init__Bidoo \
+		-DSKIP_MINGW_FORMAT \
+		-IBidoo/src/dep/gverb/include \
+		-Wno-ignored-qualifiers \
+		-Wno-sign-compare \
+		-Wno-unused-function \
+		-UBUILDING_PLUGIN_MODULES
+
 $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index b789e26..e8ebb7a 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -697,7 +697,7 @@ extern Plugin* pluginInstance__Autinn;
 Plugin* pluginInstance__Axioma;
 Plugin* pluginInstance__Bacon;
 Plugin* pluginInstance__Befaco;
-Plugin* pluginInstance__Bidoo;
+extern Plugin* pluginInstance__Bidoo;
 Plugin* pluginInstance__BogaudioModules;
 Plugin* pluginInstance__CatroModulo;
 Plugin* pluginInstance__cf;
@@ -1204,6 +1204,7 @@ static void initStatic__Bidoo()
         p->addModel(modelDTROY);
         p->addModel(modelBORDL);
         p->addModel(modelZOUMAI);
+        p->addModel(modelZOUMAIExpander);
         p->addModel(modelMU);
         p->addModel(modelCHUTE);
         p->addModel(modelLOURDE);
@@ -1687,6 +1688,7 @@ static void initStatic__GrandeModular()
     {
         p->addModel(modelClip);
         p->addModel(modelLFO3);
+        p->addModel(modelLFO4);
         p->addModel(modelLogic);
         p->addModel(modelMerge8);
         p->addModel(modelMergeSplit4);
@@ -1696,6 +1698,7 @@ static void initStatic__GrandeModular()
         p->addModel(modelPeak);
         p->addModel(modelPolyMergeResplit);
         p->addModel(modelPolySplit);
+        p->addModel(modelPush);
         p->addModel(modelQuant);
         p->addModel(modelQuantIntervals);
         p->addModel(modelQuantMT);