From 62bacc69acf291cfaf6ac5bfebed9fb48511df9d Mon Sep 17 00:00:00 2001 From: washikano Date: Fri, 26 Apr 2024 02:31:10 -0600 Subject: [PATCH] Add LOGinstruments to Makefile and plugins.cpp --- plugins/Makefile | 12 ++++++++++++ plugins/plugins.cpp | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index d929601..330763f 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -848,6 +848,11 @@ PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/s # modules/types which are present in other plugins LITTLEUTILS_CUSTOM = MsDisplayWidget +# -------------------------------------------------------------- +# LOGinstruments + +PLUGIN_FILES += $(filter-out LOGinstruments/src/LOGinstruments.cpp,$(wildcard LOGinstruments/src/*.cpp)) + # -------------------------------------------------------------- # LomasModules @@ -2508,6 +2513,13 @@ $(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp $(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \ -DpluginInstance=pluginInstance__LittleUtils +$(BUILD_DIR)/LOGinstruments/src/%.cpp.o: LOGinstruments/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(LOGINSTRUMENTS_CUSTOM),$(call custom_module_names,$(m),LOGinstruments)) \ + -DpluginInstance=pluginInstance__LOGinstruments + $(BUILD_DIR)/LomasModules/%.cpp.o: LomasModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 8b2d834..b33b44d 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -587,6 +587,10 @@ extern Model* modelDriftgen; extern Model* modelLooperOne; extern Model* modelLooperTwo; +// LOGinstruments +#include "LOGinstruments/src/kiss_fft.c" +#include "LOGinstruments/src/LOGinstruments.hpp" + // LomasModules #include "LomasModules/src/plugin.hpp" #undef DR_WAV_IMPLEMENTATION @@ -933,6 +937,7 @@ Plugin* pluginInstance__kocmoc; Plugin* pluginInstance__LifeFormModular; Plugin* pluginInstance__LilacLoop; Plugin* pluginInstance__LittleUtils; +Plugin* pluginInstance__LOGinstruments; Plugin* pluginInstance__Lomas; Plugin* pluginInstance__Lyrae; Plugin* pluginInstance__Meander; @@ -2551,6 +2556,21 @@ static void initStatic__LittleUtils() } } +static void initStatic__LOGinstruments() +{ + Plugin* const p = new Plugin; + pluginInstance__LOGinstruments = p; + + const StaticPluginLoader spl(p, "LOGinstruments"); + if (spl.ok()) + { + p->addModel(modelSpeck); + p->addModel(modelLessMess); + p->addModel(modelVelvet); + p->addModel(modelCrystal); + } +} + static void initStatic__Lomas() { Plugin* const p = new Plugin; @@ -3414,6 +3434,7 @@ void initStaticPlugins() initStatic__LifeFormModular(); initStatic__LilacLoop(); initStatic__LittleUtils(); + initStatic__LOGinstruments(); initStatic__Lomas(); initStatic__Lyrae(); initStatic__Meander();