brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal with extra name conflicts for HetrickCV

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-12-05 17:03:22 +00:00
parent bf83f160cb
commit 54f4bf7908
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/Makefile
View file

@ -445,7 +445,7 @@ PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/Domain.cpp)
PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/scl.cpp) PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/scl.cpp)
# modules/types which are present in other plugins # modules/types which are present in other plugins
HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide MinMax
# -------------------------------------------------------------- # --------------------------------------------------------------
# ImpromptuModular # ImpromptuModular
@ -1010,6 +1010,7 @@ $(BUILD_DIR)/HetrickCV/%.cpp.o: HetrickCV/%.cpp
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(HETRICKCV_CUSTOM),$(call custom_module_names,$(m),HetrickCV)) \ $(foreach m,$(HETRICKCV_CUSTOM),$(call custom_module_names,$(m),HetrickCV)) \
-DpluginInstance=pluginInstance__HetrickCV \ -DpluginInstance=pluginInstance__HetrickCV \
-DSTDIO_OVERRIDE=HetrickCV \
-IHetrickCV/Gamma \ -IHetrickCV/Gamma \
-Wno-unused-but-set-variable -Wno-unused-but-set-variable

4
plugins/plugins.cpp
View file

@ -309,6 +309,7 @@ extern Model *modelBlankPanel;
#define modelBlankPanel modelHetrickCVBlankPanel #define modelBlankPanel modelHetrickCVBlankPanel
#define modelFlipFlop modelHetrickCVFlipFlop #define modelFlipFlop modelHetrickCVFlipFlop
#define modelMidSide modelHetrickCVMidSide #define modelMidSide modelHetrickCVMidSide
#define modelMinMax modelHetrickCVMinMax
extern Model *modelTwoToFour; extern Model *modelTwoToFour;
extern Model *modelAnalogToDigital; extern Model *modelAnalogToDigital;
extern Model *modelASR; extern Model *modelASR;
@ -348,6 +349,7 @@ extern Model *modelXYToPolar;
#undef modelBlankPanel #undef modelBlankPanel
#undef modelFlipFlop #undef modelFlipFlop
#undef modelMidSide #undef modelMidSide
#undef modelMinMax
// JW-Modules // JW-Modules
#define modelQuantizer modelJWQuantizer #define modelQuantizer modelJWQuantizer
@ -1317,6 +1319,7 @@ static void initStatic__HetrickCV()
#define modelBlankPanel modelHetrickCVBlankPanel #define modelBlankPanel modelHetrickCVBlankPanel
#define modelFlipFlop modelHetrickCVFlipFlop #define modelFlipFlop modelHetrickCVFlipFlop
#define modelMidSide modelHetrickCVMidSide #define modelMidSide modelHetrickCVMidSide
#define modelMinMax modelHetrickCVMinMax
p->addModel(modelTwoToFour); p->addModel(modelTwoToFour);
p->addModel(modelAnalogToDigital); p->addModel(modelAnalogToDigital);
p->addModel(modelASR); p->addModel(modelASR);
@ -1356,6 +1359,7 @@ static void initStatic__HetrickCV()
#undef modelBlankPanel #undef modelBlankPanel
#undef modelFlipFlop #undef modelFlipFlop
#undef modelMidSide #undef modelMidSide
#undef modelMinMax
} }
} }