Add Lomas Modules

This commit is contained in:
falkTX 2021-12-16 00:40:27 +00:00
parent e42953561c
commit 06d28731d6
7 changed files with 40 additions and 2 deletions

3
.gitmodules vendored
View file

@ -124,3 +124,6 @@
[submodule "deps/PawPaw"] [submodule "deps/PawPaw"]
path = deps/PawPaw path = deps/PawPaw
url = https://github.com/DISTRHO/PawPaw.git url = https://github.com/DISTRHO/PawPaw.git
[submodule "plugins/LomasModules"]
path = plugins/LomasModules
url = https://github.com/LomasModules/LomasModules.git

View file

@ -102,6 +102,7 @@ At the moment the following 3rd-party modules are provided:
- JW-Modules - JW-Modules
- LifeFormModular - LifeFormModular
- Little Utils - Little Utils
- Lomas Modules
- Lyrae Modules - Lyrae Modules
- MindMeld - MindMeld
- Mog - Mog

View file

@ -38,6 +38,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| JW-Modules | BSD-3-Clause | | | JW-Modules | BSD-3-Clause | |
| LifeFormModular | MIT | | | LifeFormModular | MIT | |
| Little Utils | MIT | | | Little Utils | MIT | |
| Lomas Modules | GPL-3.0-or-later | |
| Lyrae Modules | GPL-3.0-or-later | | | Lyrae Modules | GPL-3.0-or-later | |
| MindMeld | GPL-3.0-or-later | | | MindMeld | GPL-3.0-or-later | |
| Mog | CC0-1.0 | | | Mog | CC0-1.0 | |

1
plugins/LomasModules Submodule

@ -0,0 +1 @@
Subproject commit b1e8edf1e11e2f725b8f27c8091613f9eda86e37

View file

@ -500,6 +500,11 @@ PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/s
# modules/types which are present in other plugins # modules/types which are present in other plugins
LITTLEUTILS_CUSTOM = MsDisplayWidget LITTLEUTILS_CUSTOM = MsDisplayWidget
# --------------------------------------------------------------
# LomasModules
PLUGIN_FILES += $(filter-out LomasModules/src/plugin.cpp,$(wildcard LomasModules/src/*.cpp))
# -------------------------------------------------------------- # --------------------------------------------------------------
# LyraeModules # LyraeModules
@ -1140,6 +1145,13 @@ $(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp
$(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \ $(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \
-DpluginInstance=pluginInstance__LittleUtils -DpluginInstance=pluginInstance__LittleUtils
$(BUILD_DIR)/LomasModules/%.cpp.o: LomasModules/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(LOMAS_CUSTOM),$(call custom_module_names,$(m),Lomas)) \
-DpluginInstance=pluginInstance__Lomas
$(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp $(BUILD_DIR)/LyraeModules/%.cpp.o: LyraeModules/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"

View file

@ -383,6 +383,10 @@ extern Model* modelDriftgen;
// LittleUtils // LittleUtils
#include "LittleUtils/src/plugin.hpp" #include "LittleUtils/src/plugin.hpp"
// LomasModules
#include "LomasModules/src/plugin.hpp"
#undef DR_WAV_IMPLEMENTATION
// LyraeModules // LyraeModules
/* NOTE too much noise in original include, do this a different way /* NOTE too much noise in original include, do this a different way
// #include "LyraeModules/src/plugin.hpp" // #include "LyraeModules/src/plugin.hpp"
@ -515,6 +519,7 @@ extern Plugin* pluginInstance__ImpromptuModular;
Plugin* pluginInstance__JW; Plugin* pluginInstance__JW;
Plugin* pluginInstance__LifeFormModular; Plugin* pluginInstance__LifeFormModular;
Plugin* pluginInstance__LittleUtils; Plugin* pluginInstance__LittleUtils;
Plugin* pluginInstance__Lomas;
Plugin* pluginInstance__Lyrae; Plugin* pluginInstance__Lyrae;
extern Plugin* pluginInstance__MindMeld; extern Plugin* pluginInstance__MindMeld;
Plugin* pluginInstance__Mog; Plugin* pluginInstance__Mog;
@ -1573,6 +1578,19 @@ static void initStatic__LittleUtils()
} }
} }
static void initStatic__Lomas()
{
Plugin* const p = new Plugin;
pluginInstance__Lomas = p;
const StaticPluginLoader spl(p, "LomasModules");
if (spl.ok())
{
p->addModel(modelAdvancedSampler);
p->addModel(modelGateSequencer);
}
}
static void initStatic__Lyrae() static void initStatic__Lyrae()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@ -1857,6 +1875,7 @@ void initStaticPlugins()
initStatic__JW(); initStatic__JW();
initStatic__LifeFormModular(); initStatic__LifeFormModular();
initStatic__LittleUtils(); initStatic__LittleUtils();
initStatic__Lomas();
initStatic__Lyrae(); initStatic__Lyrae();
initStatic__MindMeld(); initStatic__MindMeld();
initStatic__Mog(); initStatic__Mog();

1
plugins/res/LomasModules Symbolic link
View file

@ -0,0 +1 @@
../LomasModules/res