Finalize stoermelder-packone

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-01 19:06:00 +00:00
parent 977ea87310
commit da56d13cf7
2 changed files with 10 additions and 8 deletions

View file

@ -915,7 +915,8 @@ STOERMELDER_PACKONE_IGNORED += MidiCat MidiCatCtx MidiCatMem MidiKey MidiMon Mid
PLUGIN_FILES += $(filter-out $(STOERMELDER_PACKONE_IGNORED:%=stoermelder-packone/src/%.cpp),$(wildcard stoermelder-packone/src/*.cpp stoermelder-packone/src/mb/*.cpp)) PLUGIN_FILES += $(filter-out $(STOERMELDER_PACKONE_IGNORED:%=stoermelder-packone/src/%.cpp),$(wildcard stoermelder-packone/src/*.cpp stoermelder-packone/src/mb/*.cpp))
# modules/types which are present in other plugins # modules/types which are present in other plugins
STOERMELDER_PACKONE_CUSTOM = STOERMELDER_PACKONE_CUSTOM = LongPressButton
STOERMELDER_PACKONE_CUSTOM_PER_FILE = InputLedDisplay IntermixEnvModule
# -------------------------------------------------------------- # --------------------------------------------------------------
# unless_modules # unless_modules
@ -2029,9 +2030,10 @@ $(BUILD_DIR)/stoermelder-packone/%.cpp.o: stoermelder-packone/%.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,$(STOERMELDER_PACKONE_CUSTOM),$(call custom_module_names,$(m),stoermelder_packone)) \ $(foreach m,$(STOERMELDER_PACKONE_CUSTOM),$(call custom_module_names,$(m),stoermelder_p1)) \
-DpluginInstance=pluginInstance__stoermelder_packone \ $(foreach m,$(STOERMELDER_PACKONE_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),stoermelder_p1_$(shell basename $*))) \
-Dinit=init__stoermelder_packone -DpluginInstance=pluginInstance__stoermelder_p1 \
-Dinit=init__stoermelder_p1
$(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp $(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"

View file

@ -840,7 +840,7 @@ Plugin* pluginInstance__RebelTech;
Plugin* pluginInstance__repelzen; Plugin* pluginInstance__repelzen;
Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__sonusmodular;
Plugin* pluginInstance__stocaudio; Plugin* pluginInstance__stocaudio;
extern Plugin* pluginInstance__stoermelder_packone; extern Plugin* pluginInstance__stoermelder_p1;
Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__unless_modules;
Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__Voxglitch; Plugin* pluginInstance__Voxglitch;
@ -2760,10 +2760,10 @@ static void initStatic__stocaudio()
} }
} }
static void initStatic__stoermelder_packone() static void initStatic__stoermelder_p1()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
pluginInstance__stoermelder_packone = p; pluginInstance__stoermelder_p1 = p;
const StaticPluginLoader spl(p, "stoermelder-packone"); const StaticPluginLoader spl(p, "stoermelder-packone");
if (spl.ok()) if (spl.ok())
@ -3023,7 +3023,7 @@ void initStaticPlugins()
initStatic__repelzen(); initStatic__repelzen();
initStatic__sonusmodular(); initStatic__sonusmodular();
initStatic__stocaudio(); initStatic__stocaudio();
initStatic__stoermelder_packone(), initStatic__stoermelder_p1(),
initStatic__unless_modules(); initStatic__unless_modules();
initStatic__ValleyAudio(); initStatic__ValleyAudio();
initStatic__Voxglitch(); initStatic__Voxglitch();