Fixup for meander module inclusion
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
83de2207b4
commit
8ef6a2dff5
4 changed files with 15 additions and 3 deletions
|
@ -163,7 +163,11 @@ Below is a list of artwork licenses from plugins
|
|||
| LomasModules/Fonts/FiraMono-Bold.ttf | OFL-1.1-RFN | |
|
||||
| LyraeModules/* | CC-BY-NC-SA-4.0 | |
|
||||
| Meander/* | GPL-3.0-or-later | No artwork specific license provided |
|
||||
| Meander/*.ttf | unknown | Contains a number of font files not all of which have resolved licenses |
|
||||
| Meander/Bravura.otf | OFL-1.1-RFN | |
|
||||
| Meander/DejaVuSansMono.ttf | Bitstream-Vera | |
|
||||
| Meander/Michroma-Regular.ttf | OFL-1.1-RFN | |
|
||||
| Meander/Segment7Standard.ttf | OFL-1.1-RFN | |
|
||||
| Meander/Ubuntu Condensed 400.ttf | UFL-1.0 | Ubuntu Font License, based on OFL-1.1 |
|
||||
| MindMeld/* | CC-BY-NC-ND-4.0 | |
|
||||
| MindMeld/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
|
||||
| ML_modules/* | BSD-3-Clause | No artwork specific license provided |
|
||||
|
|
|
@ -647,6 +647,7 @@ LYRAE_CUSTOM = Delta
|
|||
|
||||
# --------------------------------------------------------------
|
||||
# Meander
|
||||
|
||||
PLUGIN_FILES += $(filter-out Meander/src/plugin.cpp,$(wildcard Meander/src/*.cpp))
|
||||
|
||||
# --------------------------------------------------------------
|
||||
|
@ -1012,6 +1013,7 @@ PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json))
|
|||
endif
|
||||
|
||||
UNWANTED_FILES = HetrickCV/res/illustrator - deprecated/MyModule.svg
|
||||
UNWANTED_FILES += $(wildcard Meander/res/*)
|
||||
UNWANTED_FILES += $(wildcard Mog/res/*)
|
||||
UNWANTED_FILES += $(wildcard Mog/res/*/*)
|
||||
UNWANTED_FILES += $(wildcard nonlinearcircuits/res/*)
|
||||
|
@ -1042,6 +1044,7 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityPresets
|
|||
RESOURCE_FILES += MindMeldModular/res/ShapeMaster/CommunityShapes
|
||||
RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldPresets
|
||||
RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes
|
||||
RESOURCE_FILES += Meander/res
|
||||
RESOURCE_FILES += Mog/res
|
||||
RESOURCE_FILES += nonlinearcircuits/res
|
||||
RESOURCE_FILES += ParableInstruments/res/Neil.png
|
||||
|
@ -1592,7 +1595,9 @@ $(BUILD_DIR)/Meander/src/Meander.cpp.o: Meander/src/Meander.cpp
|
|||
@echo "Compiling $<"
|
||||
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
|
||||
$(foreach m,$(MEANDER_CUSTOM),$(call custom_module_names,$(m),Meander)) \
|
||||
-DpluginInstance=pluginInstance__Meander
|
||||
-DpluginInstance=pluginInstance__Meander \
|
||||
-Wno-format-security \
|
||||
-Wno-format-zero-length
|
||||
|
||||
$(BUILD_DIR)/MindMeldModular/src/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp
|
||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 8a81a4df886c4c2cd7de3aaf721fbf848bba6f93
|
||||
Subproject commit 9b2011f2d1578268656ebca4313ad3aaa16ee4ee
|
|
@ -468,6 +468,7 @@ extern Model* modelZeta;
|
|||
#undef modelDelta
|
||||
|
||||
// Meander
|
||||
extern int panelTheme;
|
||||
#include "Meander/src/plugin.hpp"
|
||||
|
||||
// MindMeldModular
|
||||
|
@ -1988,6 +1989,8 @@ static void initStatic__Meander()
|
|||
const StaticPluginLoader spl(p, "Meander");
|
||||
if (spl.ok())
|
||||
{
|
||||
// for dark theme
|
||||
panelTheme = 1;
|
||||
p->addModel(modelMeander);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue