[WIP] add Meander
This commit is contained in:
parent
8cbaaab100
commit
83de2207b4
6 changed files with 37 additions and 0 deletions
4
.gitmodules
vendored
4
.gitmodules
vendored
|
@ -193,3 +193,7 @@
|
|||
[submodule "plugins/PinkTrombone"]
|
||||
path = plugins/PinkTrombone
|
||||
url = https://github.com/VegaDeftwing/PinkTromboneVCV.git
|
||||
[submodule "plugins/Meander"]
|
||||
path = plugins/Meander
|
||||
url = https://github.com/knchaffin/Meander.git
|
||||
branch = master-V2
|
||||
|
|
|
@ -145,6 +145,7 @@ At the moment the following 3rd-party modules are provided:
|
|||
- Little Utils
|
||||
- Lomas Modules
|
||||
- Lyrae Modules
|
||||
- Meander
|
||||
- MindMeld
|
||||
- ML Modules
|
||||
- Mockba Modular
|
||||
|
|
|
@ -51,6 +51,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
|
|||
| Little Utils | EUPL-1.2 | |
|
||||
| Lomas Modules | GPL-3.0-or-later | |
|
||||
| Lyrae Modules | GPL-3.0-or-later | |
|
||||
| Meander | GPL-3.0-or-later | |
|
||||
| MindMeld | GPL-3.0-or-later | |
|
||||
| ML Modules | BSD-3-Clause | |
|
||||
| Mockba Modular | MIT | |
|
||||
|
@ -161,6 +162,8 @@ Below is a list of artwork licenses from plugins
|
|||
| LomasModules/* | GPL-3.0-or-later | [Same license as source code](https://github.com/LomasModules/LomasModules/issues/26) |
|
||||
| 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 |
|
||||
| MindMeld/* | CC-BY-NC-ND-4.0 | |
|
||||
| MindMeld/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
|
||||
| ML_modules/* | BSD-3-Clause | No artwork specific license provided |
|
||||
|
|
|
@ -645,6 +645,10 @@ PLUGIN_FILES += $(filter-out LyraeModules/src/plugin.cpp,$(wildcard LyraeModules
|
|||
# modules/types which are present in other plugins
|
||||
LYRAE_CUSTOM = Delta
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# Meander
|
||||
PLUGIN_FILES += $(filter-out Meander/src/plugin.cpp,$(wildcard Meander/src/*.cpp))
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# MindMeld
|
||||
|
||||
|
@ -1583,6 +1587,13 @@ $(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
|
||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||
@echo "Compiling $<"
|
||||
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
|
||||
$(foreach m,$(MEANDER_CUSTOM),$(call custom_module_names,$(m),Meander)) \
|
||||
-DpluginInstance=pluginInstance__Meander
|
||||
|
||||
$(BUILD_DIR)/MindMeldModular/src/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp
|
||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||
@echo "Compiling $<"
|
||||
|
|
1
plugins/Meander
Submodule
1
plugins/Meander
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 8a81a4df886c4c2cd7de3aaf721fbf848bba6f93
|
|
@ -467,6 +467,9 @@ extern Model* modelBD383238;
|
|||
extern Model* modelZeta;
|
||||
#undef modelDelta
|
||||
|
||||
// Meander
|
||||
#include "Meander/src/plugin.hpp"
|
||||
|
||||
// MindMeldModular
|
||||
/* NOTE too much noise in original include, do this a different way
|
||||
// #include "MindMeldModular/src/MindMeldModular.hpp"
|
||||
|
@ -726,6 +729,7 @@ Plugin* pluginInstance__LilacLoop;
|
|||
Plugin* pluginInstance__LittleUtils;
|
||||
Plugin* pluginInstance__Lomas;
|
||||
Plugin* pluginInstance__Lyrae;
|
||||
Plugin* pluginInstance__Meander;
|
||||
extern Plugin* pluginInstance__MindMeld;
|
||||
Plugin* pluginInstance__ML;
|
||||
Plugin* pluginInstance__MockbaModular;
|
||||
|
@ -1976,6 +1980,18 @@ static void initStatic__Lyrae()
|
|||
}
|
||||
}
|
||||
|
||||
static void initStatic__Meander()
|
||||
{
|
||||
Plugin* const p = new Plugin;
|
||||
pluginInstance__Meander = p;
|
||||
|
||||
const StaticPluginLoader spl(p, "Meander");
|
||||
if (spl.ok())
|
||||
{
|
||||
p->addModel(modelMeander);
|
||||
}
|
||||
}
|
||||
|
||||
static void initStatic__MindMeld()
|
||||
{
|
||||
Plugin* const p = new Plugin;
|
||||
|
@ -2552,6 +2568,7 @@ void initStaticPlugins()
|
|||
initStatic__LittleUtils();
|
||||
initStatic__Lomas();
|
||||
initStatic__Lyrae();
|
||||
initStatic__Meander();
|
||||
initStatic__MindMeld();
|
||||
initStatic__ML();
|
||||
initStatic__MockbaModular();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue