* adding Hampton Harmonics * add custom module in makefile * custom moduletags/22.03
| @@ -145,3 +145,6 @@ | |||||
| [submodule "plugins/GoodSheperd"] | [submodule "plugins/GoodSheperd"] | ||||
| path = plugins/GoodSheperd | path = plugins/GoodSheperd | ||||
| url = https://github.com/jensschulze/GoodSheperd.git | url = https://github.com/jensschulze/GoodSheperd.git | ||||
| [submodule "plugins/HamptonHarmonics"] | |||||
| path = plugins/HamptonHarmonics | |||||
| url = https://gitlab.com/hampton-harmonics/hampton-harmonics-modules.git | |||||
| @@ -124,6 +124,7 @@ At the moment the following 3rd-party modules are provided: | |||||
| - Glue the Giant | - Glue the Giant | ||||
| - GoodSheperd | - GoodSheperd | ||||
| - Grande | - Grande | ||||
| - Hampton Harmonics | |||||
| - HetrickCV | - HetrickCV | ||||
| - ihtsyn | - ihtsyn | ||||
| - Impromptu | - Impromptu | ||||
| @@ -35,6 +35,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 | | | ||||
| | Hampton Harmonics | MIT | | | |||||
| | HetrickCV | CC0-1.0 | | | | HetrickCV | CC0-1.0 | | | ||||
| | ihtsyn | GPL-3.0-or-later | | | | ihtsyn | GPL-3.0-or-later | | | ||||
| | Impromptu | GPL-3.0-or-later | | | | Impromptu | GPL-3.0-or-later | | | ||||
| @@ -117,6 +118,8 @@ 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 | | | ||||
| | HamptonHarmonics/* | MIT | No artwork specific license provided | | |||||
| | HamptonHarmonics/PixelOperator.ttf | CC0-1.0 | | | |||||
| | HetrickCV/* | CC0-1.0 | | | | HetrickCV/* | CC0-1.0 | | | ||||
| | ihtsyn/* | GPL-3.0-or-later | [Same license as source code](https://github.com/nysthi/nysthi/issues/379#issuecomment-1027873902) | | | ihtsyn/* | GPL-3.0-or-later | [Same license as source code](https://github.com/nysthi/nysthi/issues/379#issuecomment-1027873902) | | ||||
| | ImpromptuModular/* | CC-BY-NC-ND-4.0 | | | | ImpromptuModular/* | CC-BY-NC-ND-4.0 | | | ||||
| @@ -0,0 +1 @@ | |||||
| Subproject commit e5cf81f1c356fdc98fd08584146cda8af7e16b1f | |||||
| @@ -496,6 +496,14 @@ PLUGIN_FILES += $(wildcard GoodSheperd/src/*.cpp) | |||||
| PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp)) | PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp)) | ||||
| # -------------------------------------------------------------- | |||||
| # Hampton Harmonics | |||||
| PLUGIN_FILES += $(wildcard HamptonHarmonics/src/*.cpp) | |||||
| # modules/types which are present in other plugins | |||||
| HAMPTONHARMONICS_CUSTOM = Arp Progress | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| # HetrickCV | # HetrickCV | ||||
| @@ -1290,6 +1298,13 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp | |||||
| -Wno-missing-braces \ | -Wno-missing-braces \ | ||||
| -Wno-self-assign | -Wno-self-assign | ||||
| $(BUILD_DIR)/HamptonHarmonics/%.cpp.o: HamptonHarmonics/%.cpp | |||||
| -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | |||||
| @echo "Compiling $<" | |||||
| $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ | |||||
| $(foreach m,$(HAMPTONHARMONICS_CUSTOM),$(call custom_module_names,$(m),HamptonHarmonics)) \ | |||||
| -DpluginInstance=pluginInstance__HamptonHarmonics | |||||
| $(BUILD_DIR)/HetrickCV/%.cpp.o: HetrickCV/%.cpp | $(BUILD_DIR)/HetrickCV/%.cpp.o: HetrickCV/%.cpp | ||||
| -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | ||||
| @echo "Compiling $<" | @echo "Compiling $<" | ||||
| @@ -311,6 +311,13 @@ void saveGtgPluginDefault(const char*, int) {} | |||||
| // GrandeModular | // GrandeModular | ||||
| #include "GrandeModular/src/plugin.hpp" | #include "GrandeModular/src/plugin.hpp" | ||||
| // Hampton Harmonics | |||||
| #define modelArp modelHamptonHarmonicsArp | |||||
| #define modelProgress modelHamptonHarmonicsProgress | |||||
| #include "HamptonHarmonics/src/plugin.hpp" | |||||
| #undef modelProgress | |||||
| #undef modelArp | |||||
| // HetrickCV | // HetrickCV | ||||
| #define modelASR modelHetrickCVASR | #define modelASR modelHetrickCVASR | ||||
| #define modelBlankPanel modelHetrickCVBlankPanel | #define modelBlankPanel modelHetrickCVBlankPanel | ||||
| @@ -596,6 +603,7 @@ Plugin* pluginInstance__Fundamental; | |||||
| Plugin* pluginInstance__GlueTheGiant; | Plugin* pluginInstance__GlueTheGiant; | ||||
| Plugin* pluginInstance__GoodSheperd; | Plugin* pluginInstance__GoodSheperd; | ||||
| Plugin* pluginInstance__GrandeModular; | Plugin* pluginInstance__GrandeModular; | ||||
| Plugin* pluginInstance__HamptonHarmonics; | |||||
| Plugin* pluginInstance__HetrickCV; | Plugin* pluginInstance__HetrickCV; | ||||
| extern Plugin* pluginInstance__ImpromptuModular; | extern Plugin* pluginInstance__ImpromptuModular; | ||||
| Plugin* pluginInstance__ihtsyn; | Plugin* pluginInstance__ihtsyn; | ||||
| @@ -1510,6 +1518,23 @@ static void initStatic__GrandeModular() | |||||
| } | } | ||||
| } | } | ||||
| static void initStatic__HamptonHarmonics() | |||||
| { | |||||
| Plugin* const p = new Plugin; | |||||
| pluginInstance__HamptonHarmonics = p; | |||||
| const StaticPluginLoader spl(p, "HamptonHarmonics"); | |||||
| if (spl.ok()) | |||||
| { | |||||
| #define modelArp modelHamptonHarmonicsArp | |||||
| #define modelProgress modelHamptonHarmonicsProgress | |||||
| p->addModel(modelArp); | |||||
| p->addModel(modelProgress); | |||||
| #undef modelProgress | |||||
| #undef modelArp | |||||
| } | |||||
| } | |||||
| static void initStatic__HetrickCV() | static void initStatic__HetrickCV() | ||||
| { | { | ||||
| Plugin* const p = new Plugin; | Plugin* const p = new Plugin; | ||||
| @@ -2086,6 +2111,7 @@ void initStaticPlugins() | |||||
| initStatic__GlueTheGiant(); | initStatic__GlueTheGiant(); | ||||
| initStatic__GoodSheperd(); | initStatic__GoodSheperd(); | ||||
| initStatic__GrandeModular(); | initStatic__GrandeModular(); | ||||
| initStatic__HamptonHarmonics(); | |||||
| initStatic__HetrickCV(); | initStatic__HetrickCV(); | ||||
| initStatic__ImpromptuModular(); | initStatic__ImpromptuModular(); | ||||
| initStatic__ihtsyn(); | initStatic__ihtsyn(); | ||||