From 54f4bf7908e7e60db6335c3c5dc2bdd521c5e376 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 5 Dec 2021 17:03:22 +0000 Subject: [PATCH] Deal with extra name conflicts for HetrickCV Signed-off-by: falkTX --- plugins/Makefile | 3 ++- plugins/plugins.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/Makefile b/plugins/Makefile index 28c3e96..5636e19 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -445,7 +445,7 @@ PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/Domain.cpp) PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/scl.cpp) # modules/types which are present in other plugins -HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide +HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide MinMax # -------------------------------------------------------------- # ImpromptuModular @@ -1010,6 +1010,7 @@ $(BUILD_DIR)/HetrickCV/%.cpp.o: HetrickCV/%.cpp $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(HETRICKCV_CUSTOM),$(call custom_module_names,$(m),HetrickCV)) \ -DpluginInstance=pluginInstance__HetrickCV \ + -DSTDIO_OVERRIDE=HetrickCV \ -IHetrickCV/Gamma \ -Wno-unused-but-set-variable diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 0db81da..a7e532d 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -309,6 +309,7 @@ extern Model *modelBlankPanel; #define modelBlankPanel modelHetrickCVBlankPanel #define modelFlipFlop modelHetrickCVFlipFlop #define modelMidSide modelHetrickCVMidSide +#define modelMinMax modelHetrickCVMinMax extern Model *modelTwoToFour; extern Model *modelAnalogToDigital; extern Model *modelASR; @@ -348,6 +349,7 @@ extern Model *modelXYToPolar; #undef modelBlankPanel #undef modelFlipFlop #undef modelMidSide +#undef modelMinMax // JW-Modules #define modelQuantizer modelJWQuantizer @@ -1317,6 +1319,7 @@ static void initStatic__HetrickCV() #define modelBlankPanel modelHetrickCVBlankPanel #define modelFlipFlop modelHetrickCVFlipFlop #define modelMidSide modelHetrickCVMidSide +#define modelMinMax modelHetrickCVMinMax p->addModel(modelTwoToFour); p->addModel(modelAnalogToDigital); p->addModel(modelASR); @@ -1356,6 +1359,7 @@ static void initStatic__HetrickCV() #undef modelBlankPanel #undef modelFlipFlop #undef modelMidSide +#undef modelMinMax } }