Browse Source

Deal with extra name conflicts for HetrickCV

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
54f4bf7908
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 6 additions and 1 deletions
  1. +2
    -1
      plugins/Makefile
  2. +4
    -0
      plugins/plugins.cpp

+ 2
- 1
plugins/Makefile View File

@@ -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



+ 4
- 0
plugins/plugins.cpp View File

@@ -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
}
}



Loading…
Cancel
Save