diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 index 8ed60c2e..266ac2ce --- a/.gitmodules +++ b/.gitmodules @@ -209,3 +209,6 @@ [submodule "plugins/myth-modules"] path = plugins/myth-modules url = https://github.com/Ahineya/vcv-myth-plugin.git +[submodule "plugins/Mojo"] + path = plugins/Mojo + url = https://github.com/TheGuyWhoo/Mojo diff --git a/plugins/Makefile b/plugins/Makefile index d787fe44..fb4be93b 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -222,8 +222,8 @@ ifneq ($(HEADLESS),true) PLUGIN_FILES += Cardinal/src/ImGuiWidget.cpp PLUGIN_FILES += Cardinal/src/ImGuiTextEditor.cpp PLUGIN_FILES += Cardinal/src/SassyScope.cpp -PLUGIN_FILES += Cardinal/src/DearImGui.cpp -PLUGIN_FILES += Cardinal/src/DearImGuiColorTextEditor.cpp +PLUGIN_FILES += $(wildcard Cardinal/src/DearImGui/*.cpp) +PLUGIN_FILES += $(wildcard Cardinal/src/DearImGuiColorTextEditor/*.cpp) endif ifeq ($(shell pkg-config --exists fftw3f && echo true),true) @@ -713,6 +713,11 @@ MOCKBAMODULAR_CUSTOM = Blank Comparator PLUGIN_FILES += Mog/src/Network.cpp PLUGIN_FILES += Mog/src/Nexus.cpp +# -------------------------------------------------------------- +# Mojo + +PLUGIN_FILES += $(filter-out Mojo/src/plugin.cpp,$(wildcard Mojo/src/*.cpp)) + # -------------------------------------------------------------- # mscHack @@ -1701,6 +1706,14 @@ $(BUILD_DIR)/Mog/%.cpp.o: Mog/%.cpp $(foreach m,$(MOG_CUSTOM),$(call custom_module_names,$(m),Mog)) \ -DpluginInstance=pluginInstance__Mog +$(BUILD_DIR)/Mojo/src/%.cpp.o: Mojo/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(MOJO_CUSTOM),$(call custom_module_names,$(m),Mojo)) \ + -DpluginInstance=pluginInstance__Mojo \ + -Wno-misleading-indentation + $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/Mojo b/plugins/Mojo new file mode 160000 index 00000000..7b014625 --- /dev/null +++ b/plugins/Mojo @@ -0,0 +1 @@ +Subproject commit 7b014625cdc04b397cb57b450a578b30bca6ae6a diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 712fa889..bf7f5d9f 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -561,6 +561,9 @@ std::string loadBack(int) { return "res/Empty_gray.svg"; } // Mog #include "Mog/src/plugin.hpp" +// Mojo +#include "Mojo/src/plugin.hpp" + // mscHack /* NOTE too much noise in original include, do this a different way // #include "mscHack/src/mscHack.hpp" @@ -760,6 +763,7 @@ extern Plugin* pluginInstance__MindMeld; Plugin* pluginInstance__ML; Plugin* pluginInstance__MockbaModular; Plugin* pluginInstance__Mog; +Plugin* pluginInstance__Mojo; extern Plugin* pluginInstance__mscHack; Plugin* pluginInstance__MSM; Plugin* pluginInstance__myth_modules; @@ -2265,6 +2269,20 @@ static void initStatic__Mog() } } +static void initStatic__Mojo() +{ + Plugin* const p = new Plugin; + pluginInstance__Mojo = p; + + const StaticPluginLoader spl(p, "Mojo"); + if (spl.ok()) + { + p->addModel(modelDogs); + p->addModel(modelPigs); + p->addModel(modelSheep); + } +} + static void initStatic__mscHack() { Plugin* const p = new Plugin; @@ -2741,6 +2759,7 @@ void initStaticPlugins() initStatic__ML(); initStatic__MockbaModular(); initStatic__Mog(); + initStatic__Mojo(); initStatic__mscHack(); initStatic__MSM(); initStatic__myth_modules();