Handle modelQuantizer as duplicated name
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
ecd8976d6e
commit
9725d6859e
2 changed files with 30 additions and 6 deletions
|
|
@ -224,6 +224,9 @@ else
|
||||||
PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/posix/*.cpp)
|
PLUGIN_FILES += $(wildcard JW-Modules/lib/oscpack/ip/posix/*.cpp)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# modules/types which are present in other plugins
|
||||||
|
JW_CUSTOM = Quantizer
|
||||||
|
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# rackwindows
|
# rackwindows
|
||||||
|
|
||||||
|
|
@ -264,6 +267,8 @@ BASE_FLAGS += -I../include/neon-compat
|
||||||
BASE_FLAGS += -I../src
|
BASE_FLAGS += -I../src
|
||||||
BASE_FLAGS += -I../src/Rack/include
|
BASE_FLAGS += -I../src/Rack/include
|
||||||
BASE_FLAGS += -I../src/Rack/include/dsp
|
BASE_FLAGS += -I../src/Rack/include/dsp
|
||||||
|
# # BASE_FLAGS += -I../src/Rack/dep/filesystem/include
|
||||||
|
# # BASE_FLAGS += -I../src/Rack/dep/fuzzysearchdatabase/src
|
||||||
BASE_FLAGS += -I../src/Rack/dep/glfw/include
|
BASE_FLAGS += -I../src/Rack/dep/glfw/include
|
||||||
BASE_FLAGS += -I../src/Rack/dep/nanosvg/src
|
BASE_FLAGS += -I../src/Rack/dep/nanosvg/src
|
||||||
BASE_FLAGS += -I../src/Rack/dep/osdialog
|
BASE_FLAGS += -I../src/Rack/dep/osdialog
|
||||||
|
|
@ -271,11 +276,9 @@ BASE_FLAGS += -I../src/Rack/dep/oui-blendish
|
||||||
BASE_FLAGS += -I../src/Rack/dep/pffft
|
BASE_FLAGS += -I../src/Rack/dep/pffft
|
||||||
BASE_FLAGS += -pthread
|
BASE_FLAGS += -pthread
|
||||||
|
|
||||||
# ifneq ($(SYSDEPS),true)
|
ifneq ($(SYSDEPS),true)
|
||||||
# BASE_FLAGS += -I../src/Rack/dep/include
|
BASE_FLAGS += -I../src/Rack/dep/include
|
||||||
# # BASE_FLAGS += -I../src/Rack/dep/filesystem/include
|
endif
|
||||||
# # BASE_FLAGS += -I../src/Rack/dep/fuzzysearchdatabase/src
|
|
||||||
# endif
|
|
||||||
|
|
||||||
ifeq ($(WINDOWS),true)
|
ifeq ($(WINDOWS),true)
|
||||||
BASE_FLAGS += -D_USE_MATH_DEFINES
|
BASE_FLAGS += -D_USE_MATH_DEFINES
|
||||||
|
|
@ -456,6 +459,17 @@ $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
|
||||||
-IBogaudioModules/lib \
|
-IBogaudioModules/lib \
|
||||||
-IBogaudioModules/src/dsp
|
-IBogaudioModules/src/dsp
|
||||||
|
|
||||||
|
$(BUILD_DIR)/BogaudioModules/src/follower_base.cpp.o: BogaudioModules/src/follower_base.cpp
|
||||||
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
|
@echo "Compiling $<"
|
||||||
|
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
|
||||||
|
$(foreach m,$(BOGAUDIO_CUSTOM),$(call custom_module_names,$(m),Bogaudio)) \
|
||||||
|
-DpluginInstance=pluginInstance__BogaudioModules \
|
||||||
|
-DefGainMaxDecibels=efGainMaxDecibelsDebug \
|
||||||
|
-DRACK_SIMD=1 \
|
||||||
|
-IBogaudioModules/lib \
|
||||||
|
-IBogaudioModules/src/dsp
|
||||||
|
|
||||||
$(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp
|
$(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp
|
||||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
@echo "Compiling $<"
|
@echo "Compiling $<"
|
||||||
|
|
@ -517,7 +531,11 @@ $(BUILD_DIR)/ImpromptuModular/src/comp/Components.cpp.o: ImpromptuModular/src/co
|
||||||
$(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
|
$(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
|
||||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
@echo "Compiling $<"
|
@echo "Compiling $<"
|
||||||
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__JW $(foreach m,$(JW_CUSTOM),$(call custom_module_names,$(m),JW)) -IJW-Modules/src -IJW-Modules/lib/oscpack -c -o $@
|
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
|
||||||
|
$(foreach m,$(JW_CUSTOM),$(call custom_module_names,$(m),JW)) \
|
||||||
|
-DpluginInstance=pluginInstance__JW \
|
||||||
|
-IJW-Modules/src \
|
||||||
|
-IJW-Modules/lib/oscpack
|
||||||
|
|
||||||
$(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp
|
$(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp
|
||||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
|
||||||
|
|
|
||||||
|
|
@ -212,7 +212,9 @@ extern Model *modelWriteSeq64;
|
||||||
extern Model *modelBlankPanel;
|
extern Model *modelBlankPanel;
|
||||||
|
|
||||||
// JW-Modules
|
// JW-Modules
|
||||||
|
#define modelQuantizer modelJWQuantizer
|
||||||
#include "JW-Modules/src/JWModules.hpp"
|
#include "JW-Modules/src/JWModules.hpp"
|
||||||
|
#undef modelQuantizer
|
||||||
|
|
||||||
// rackwindows
|
// rackwindows
|
||||||
#include "rackwindows/src/plugin.hpp"
|
#include "rackwindows/src/plugin.hpp"
|
||||||
|
|
@ -290,6 +292,8 @@ struct StaticPluginLoader {
|
||||||
file(nullptr),
|
file(nullptr),
|
||||||
rootJ(nullptr)
|
rootJ(nullptr)
|
||||||
{
|
{
|
||||||
|
DEBUG("Loading plugin module %s", name);
|
||||||
|
|
||||||
p->path = asset::pluginPath(name);
|
p->path = asset::pluginPath(name);
|
||||||
|
|
||||||
const std::string manifestFilename = asset::pluginManifest(name);
|
const std::string manifestFilename = asset::pluginManifest(name);
|
||||||
|
|
@ -909,6 +913,7 @@ static void initStatic__JW()
|
||||||
const StaticPluginLoader spl(p, "JW-Modules");
|
const StaticPluginLoader spl(p, "JW-Modules");
|
||||||
if (spl.ok())
|
if (spl.ok())
|
||||||
{
|
{
|
||||||
|
#define modelQuantizer modelJWQuantizer
|
||||||
p->addModel(modelAdd5);
|
p->addModel(modelAdd5);
|
||||||
p->addModel(modelBouncyBalls);
|
p->addModel(modelBouncyBalls);
|
||||||
p->addModel(modelCat);
|
p->addModel(modelCat);
|
||||||
|
|
@ -938,6 +943,7 @@ static void initStatic__JW()
|
||||||
p->addModel(modelBlankPanelLarge);
|
p->addModel(modelBlankPanelLarge);
|
||||||
p->addModel(modelCoolBreeze);
|
p->addModel(modelCoolBreeze);
|
||||||
p->addModel(modelPete);
|
p->addModel(modelPete);
|
||||||
|
#undef modelQuantizer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue