Add the admiral modules. (#730)
* Added Admiral to gitmodules * Added Admiral to Makefile * Add Admiral to plugins.cpp. * README.md * Add Admiral to README.md * Add Admiral to DIFFERENCES.md * Add admiral to LICENSES.md * Added the admiral plugin.
This commit is contained in:
parent
1fe04d7d3d
commit
546e60c2bb
7 changed files with 45 additions and 0 deletions
|
@ -346,6 +346,11 @@ PLUGIN_FILES += $(wildcard AaronStatic/src/*.cpp)
|
|||
# modules/types which are present in other plugins
|
||||
AARONSTATIC_CUSTOM = RefreshCounter
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# Admiral
|
||||
|
||||
PLUGIN_FILES += $(filter-out admiral/src/plugin.cpp,$(wildcard admiral/src/*.cpp))
|
||||
|
||||
# --------------------------------------------------------------
|
||||
# AmalgamatedHarmonics
|
||||
|
||||
|
@ -2129,6 +2134,13 @@ $(BUILD_DIR)/AaronStatic/%.cpp.o: AaronStatic/%.cpp
|
|||
-DpluginInstance=pluginInstance__AaronStatic \
|
||||
-Dinit=init__AaronStatic
|
||||
|
||||
$(BUILD_DIR)/admiral/%.cpp.o: admiral/%.cpp
|
||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||
@echo "Compiling $<"
|
||||
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
|
||||
$(foreach m,$(ADMIRAL_CUSTOM),$(call custom_module_names,$(m),admiral)) \
|
||||
-DpluginInstance=pluginInstance__admiral
|
||||
|
||||
$(BUILD_DIR)/alefsbits/%.cpp.o: alefsbits/%.cpp
|
||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||
@echo "Compiling $<"
|
||||
|
|
1
plugins/admiral
Submodule
1
plugins/admiral
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 2885b72e1e82b1103eb2cb4db2a226c57c9e5f40
|
|
@ -27,6 +27,15 @@
|
|||
// Aaron Static
|
||||
#include "AaronStatic/src/plugin.hpp"
|
||||
|
||||
// Admiral
|
||||
/* NOTE too much noise in original include, do this a different way
|
||||
// #include "admiral/src/plugin.hpp"
|
||||
*/
|
||||
extern Model* modelWatches;
|
||||
extern Model* modelShifts;
|
||||
extern Model* modelTables;
|
||||
extern Model* modelDivisions;
|
||||
|
||||
// Alef's Bits
|
||||
#define modelSteps modelalefsbitsSteps
|
||||
#define modelLogic modelalefsbitsLogic
|
||||
|
@ -907,6 +916,7 @@ Plugin* pluginInstance__Fundamental;
|
|||
Plugin* pluginInstance__21kHz;
|
||||
Plugin* pluginInstance__8Mode;
|
||||
extern Plugin* pluginInstance__AaronStatic;
|
||||
Plugin* pluginInstance__admiral;
|
||||
Plugin* pluginInstance__alefsbits;
|
||||
Plugin* pluginInstance__Algoritmarte;
|
||||
Plugin* pluginInstance__AmalgamatedHarmonics;
|
||||
|
@ -1245,6 +1255,21 @@ static void initStatic__AaronStatic()
|
|||
}
|
||||
}
|
||||
|
||||
static void initStatic__admiral()
|
||||
{
|
||||
Plugin* const p = new Plugin;
|
||||
pluginInstance__admiral = p;
|
||||
|
||||
const StaticPluginLoader spl(p, "admiral");
|
||||
if (spl.ok())
|
||||
{
|
||||
p->addModel(modelWatches);
|
||||
p->addModel(modelShifts);
|
||||
p->addModel(modelTables);
|
||||
p->addModel(modelDivisions);
|
||||
}
|
||||
}
|
||||
|
||||
static void initStatic__alefsbits()
|
||||
{
|
||||
Plugin* const p = new Plugin;
|
||||
|
@ -3474,6 +3499,7 @@ void initStaticPlugins()
|
|||
initStatic__21kHz();
|
||||
initStatic__8Mode();
|
||||
initStatic__AaronStatic();
|
||||
initStatic__admiral();
|
||||
initStatic__alefsbits();
|
||||
initStatic__Algoritmarte();
|
||||
initStatic__AmalgamatedHarmonics();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue