diff --git a/plugins/Makefile b/plugins/Makefile index df1651b..4adf1a4 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -2579,7 +2579,7 @@ $(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp $(foreach m,$(LYRAE_CUSTOM),$(call custom_module_names,$(m),Lyrae)) \ -DpluginInstance=pluginInstance__Lyrae -$(BUILD_DIR)/Meander/src/Meander.cpp.o: Meander/src/Meander.cpp +$(BUILD_DIR)/Meander/src/%.cpp.o: Meander/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ diff --git a/plugins/Meander b/plugins/Meander index b368659..3641b1a 160000 --- a/plugins/Meander +++ b/plugins/Meander @@ -1 +1 @@ -Subproject commit b36865978358ffdbeb80ad603c4c54f5a535107a +Subproject commit 3641b1a53b8da62fe2bdceec77cd22cba6776f73 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index caa3c67..894e6d8 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -614,7 +614,9 @@ extern Model* modelZeta; #undef modelDelta // Meander -extern int panelTheme; +extern int Meander_panelTheme; +extern int MSQ_panelTheme; +extern int MSP_panelTheme; #include "Meander/src/plugin.hpp" // MindMeldModular @@ -2658,8 +2660,12 @@ static void initStatic__Meander() if (spl.ok()) { // for dark theme - panelTheme = 1; + Meander_panelTheme = 1; + MSQ_panelTheme = 1; + MSP_panelTheme = 1; p->addModel(modelMeander); + p->addModel(modelModeScaleQuant); + p->addModel(modelModeScaleProgressions); } } @@ -3614,7 +3620,9 @@ void updateStaticPluginsDarkMode() } // meander { - panelTheme = darkMode ? 1 : 0; + Meander_panelTheme = darkMode ? 1 : 0; + MSQ_panelTheme = darkMode ? 1 : 0; + MSP_panelTheme = darkMode ? 1 : 0; } // glue the giant {