From 5c42805823cc9bd08b288a6488af4d0d4738afcc Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 7 Dec 2021 10:10:18 +0000 Subject: [PATCH] Add LittleUtils --- .gitmodules | 3 +++ plugins/LittleUtils | 1 + plugins/Makefile | 12 ++++++++++++ plugins/plugins.cpp | 22 ++++++++++++++++++++++ plugins/res/LittleUtils | 1 + 5 files changed, 39 insertions(+) create mode 160000 plugins/LittleUtils create mode 120000 plugins/res/LittleUtils diff --git a/.gitmodules b/.gitmodules index 51df9cb..ee5640c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,3 +106,6 @@ [submodule "plugins/LyraeModules"] path = plugins/LyraeModules url = https://github.com/VegaDeftwing/LyraeModules.git +[submodule "plugins/LittleUtils"] + path = plugins/LittleUtils + url = https://github.com/mgunyho/Little-Utils.git diff --git a/plugins/LittleUtils b/plugins/LittleUtils new file mode 160000 index 0000000..b355e00 --- /dev/null +++ b/plugins/LittleUtils @@ -0,0 +1 @@ +Subproject commit b355e00df0f198de810a39d7d6205ac7d9b4e438 diff --git a/plugins/Makefile b/plugins/Makefile index ed5ccff..2486c75 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -473,6 +473,11 @@ endif # modules/types which are present in other plugins JW_CUSTOM = PlayHead Quantizer +# -------------------------------------------------------------- +# LittleUtils + +PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/src/*.cpp)) + # -------------------------------------------------------------- # LyraeModules @@ -1053,6 +1058,13 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -Wno-unused-but-set-variable \ -Wno-unused-result +$(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \ + -DpluginInstance=pluginInstance__LittleUtils + $(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 38541c3..6609a05 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -356,6 +356,9 @@ extern Model *modelXYToPolar; #include "JW-Modules/src/JWModules.hpp" #undef modelQuantizer +// LittleUtils +#include "LittleUtils/src/plugin.hpp" + // LyraeModules /* NOTE too much noise in original include, do this a different way // #include "LyraeModules/src/plugin.hpp" @@ -481,6 +484,7 @@ Plugin* pluginInstance__GlueTheGiant; Plugin* pluginInstance__HetrickCV; extern Plugin* pluginInstance__ImpromptuModular; Plugin* pluginInstance__JW; +Plugin* pluginInstance__LittleUtils; Plugin* pluginInstance__Lyrae; extern Plugin* pluginInstance__MindMeld; Plugin* pluginInstance__Mog; @@ -1459,6 +1463,23 @@ static void initStatic__JW() } } +static void initStatic__LittleUtils() +{ + Plugin* const p = new Plugin; + pluginInstance__LittleUtils = p; + + const StaticPluginLoader spl(p, "LittleUtils"); + if (spl.ok()) + { + p->addModel(modelButtonModule); + p->addModel(modelPulseGenerator); + p->addModel(modelBias_Semitone); + p->addModel(modelMulDiv); + p->addModel(modelTeleportInModule); + p->addModel(modelTeleportOutModule); + } +} + static void initStatic__Lyrae() { Plugin* const p = new Plugin; @@ -1725,6 +1746,7 @@ void initStaticPlugins() initStatic__HetrickCV(); initStatic__ImpromptuModular(); initStatic__JW(); + initStatic__LittleUtils(); initStatic__Lyrae(); initStatic__MindMeld(); initStatic__Mog(); diff --git a/plugins/res/LittleUtils b/plugins/res/LittleUtils new file mode 120000 index 0000000..69bc351 --- /dev/null +++ b/plugins/res/LittleUtils @@ -0,0 +1 @@ +../LittleUtils/res \ No newline at end of file