Browse Source

add H4N4 Modules

tags/22.09
dreamer falkTX <falktx@falktx.com> 2 years ago
parent
commit
801a2cfad5
6 changed files with 37 additions and 1 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      README.md
  3. +2
    -0
      docs/LICENSES.md
  4. +13
    -1
      plugins/Makefile
  5. +1
    -0
      plugins/h4n4-modules
  6. +17
    -0
      plugins/plugins.cpp

+ 3
- 0
.gitmodules View File

@@ -212,3 +212,6 @@
[submodule "plugins/alefsbits"] [submodule "plugins/alefsbits"]
path = plugins/alefsbits path = plugins/alefsbits
url = https://github.com/alefnull/alefsbits.git url = https://github.com/alefnull/alefsbits.git
[submodule "plugins/h4n4-modules"]
path = plugins/h4n4-modules
url = https://github.com/hannakoppelaar/h4n4-modules.git

+ 1
- 0
README.md View File

@@ -135,6 +135,7 @@ At the moment the following 3rd-party modules are provided:
- Glue the Giant - Glue the Giant
- GoodSheperd - GoodSheperd
- Grande - Grande
- H4N4 Modules
- Hampton Harmonics - Hampton Harmonics
- HetrickCV - HetrickCV
- ihtsyn - ihtsyn


+ 2
- 0
docs/LICENSES.md View File

@@ -43,6 +43,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Glue the Giant | GPL-3.0-or-later | | | Glue the Giant | GPL-3.0-or-later | |
| GoodSheperd | GPL-3.0-or-later | | | GoodSheperd | GPL-3.0-or-later | |
| Grande | GPL-3.0-or-later | | | Grande | GPL-3.0-or-later | |
| H4N4 Modules | GPL-3.0-or-later | |
| Hampton Harmonics | MIT | | | Hampton Harmonics | MIT | |
| HetrickCV | CC0-1.0 | | | HetrickCV | CC0-1.0 | |
| ihtsyn | GPL-3.0-or-later | | | ihtsyn | GPL-3.0-or-later | |
@@ -154,6 +155,7 @@ Below is a list of artwork licenses from plugins
| GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | | | GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | |
| GoodSheperd/* | GPL-3.0-or-later | No artwork specific license provided | | GoodSheperd/* | GPL-3.0-or-later | No artwork specific license provided |
| GrandeModular/* | CC-BY-NC-ND-4.0 | | | GrandeModular/* | CC-BY-NC-ND-4.0 | |
| h4n4-modules/* | GPL-3.0-or-later | No artwork specific license provided |
| HamptonHarmonics/* | MIT | No artwork specific license provided | | HamptonHarmonics/* | MIT | No artwork specific license provided |
| HamptonHarmonics/PixelOperator.ttf | CC0-1.0 | | | HamptonHarmonics/PixelOperator.ttf | CC0-1.0 | |
| HetrickCV/* | CC0-1.0 | | | HetrickCV/* | CC0-1.0 | |


+ 13
- 1
plugins/Makefile View File

@@ -629,6 +629,11 @@ PLUGIN_FILES += $(filter-out GoodSheperd/src/plugin.cpp,$(wildcard GoodSheperd/s


PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp)) PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp))


# --------------------------------------------------------------
# H4N4 Modules

PLUGIN_FILES += $(filter-out h4n4-modules/src/plugin.cpp,$(wildcard h4n4-modules/src/*.cpp))

# -------------------------------------------------------------- # --------------------------------------------------------------
# Hampton Harmonics # Hampton Harmonics


@@ -1631,7 +1636,7 @@ $(BUILD_DIR)/forsitan-modulare/%.cpp.o: forsitan-modulare/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(GLUETHEGIANT_CUSTOM),$(call custom_module_names,$(m),forsitan)) \
$(foreach m,$(FORSITAN_CUSTOM),$(call custom_module_names,$(m),forsitan)) \
-DpluginInstance=pluginInstance__forsitan -DpluginInstance=pluginInstance__forsitan


$(BUILD_DIR)/Fundamental/%.c.o: Fundamental/%.c $(BUILD_DIR)/Fundamental/%.c.o: Fundamental/%.c
@@ -1681,6 +1686,13 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp
-Wno-narrowing \ -Wno-narrowing \
-Wno-self-assign -Wno-self-assign


$(BUILD_DIR)/h4n4-modules/%.cpp.o: h4n4-modules/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(H4N4_CUSTOM),$(call custom_module_names,$(m),H4N4)) \
-DpluginInstance=pluginInstance__H4N4

$(BUILD_DIR)/HamptonHarmonics/%.cpp.o: HamptonHarmonics/%.cpp $(BUILD_DIR)/HamptonHarmonics/%.cpp.o: HamptonHarmonics/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"


+ 1
- 0
plugins/h4n4-modules

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

+ 17
- 0
plugins/plugins.cpp View File

@@ -349,6 +349,9 @@ void saveGtgPluginDefault(const char*, int) {}
// GrandeModular // GrandeModular
#include "GrandeModular/src/plugin.hpp" #include "GrandeModular/src/plugin.hpp"


// H4N4 Modules
#include "h4n4-modules/src/plugin.hpp"

// Hampton Harmonics // Hampton Harmonics
#define modelArp modelHamptonHarmonicsArp #define modelArp modelHamptonHarmonicsArp
#define modelProgress modelHamptonHarmonicsProgress #define modelProgress modelHamptonHarmonicsProgress
@@ -756,6 +759,7 @@ Plugin* pluginInstance__forsitan;
Plugin* pluginInstance__GlueTheGiant; Plugin* pluginInstance__GlueTheGiant;
Plugin* pluginInstance__GoodSheperd; Plugin* pluginInstance__GoodSheperd;
Plugin* pluginInstance__GrandeModular; Plugin* pluginInstance__GrandeModular;
Plugin* pluginInstance__H4N4;
Plugin* pluginInstance__HamptonHarmonics; Plugin* pluginInstance__HamptonHarmonics;
Plugin* pluginInstance__HetrickCV; Plugin* pluginInstance__HetrickCV;
extern Plugin* pluginInstance__ImpromptuModular; extern Plugin* pluginInstance__ImpromptuModular;
@@ -1893,6 +1897,18 @@ static void initStatic__GrandeModular()
} }
} }


static void initStatic__H4N4()
{
Plugin* const p = new Plugin;
pluginInstance__H4N4 = p;

const StaticPluginLoader spl(p, "h4n4-modules");
if (spl.ok())
{
p->addModel(modelXenQnt);
}
}

static void initStatic__HamptonHarmonics() static void initStatic__HamptonHarmonics()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@@ -2786,6 +2802,7 @@ void initStaticPlugins()
initStatic__GlueTheGiant(); initStatic__GlueTheGiant();
initStatic__GoodSheperd(); initStatic__GoodSheperd();
initStatic__GrandeModular(); initStatic__GrandeModular();
initStatic__H4N4();
initStatic__HamptonHarmonics(); initStatic__HamptonHarmonics();
initStatic__HetrickCV(); initStatic__HetrickCV();
initStatic__ImpromptuModular(); initStatic__ImpromptuModular();


Loading…
Cancel
Save