diff --git a/plugins/BogaudioModules-helper/BogaudioModules-helper.cpp b/plugins/BogaudioModules-helper/BogaudioModules-helper.cpp new file mode 100644 index 00000000..d63930f8 --- /dev/null +++ b/plugins/BogaudioModules-helper/BogaudioModules-helper.cpp @@ -0,0 +1,19 @@ +/* + * DISTRHO Cardinal Plugin + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#include "../BogaudioModules/src/bogaudio.hpp" + +#include "../BogaudioModules/src/follower_base.hpp" +#include "../BogaudioModules/src/VCF.hpp" + +namespace bogaudio { + +constexpr float FollowerBase::efGainMinDecibels; +constexpr float FollowerBase::efGainMaxDecibels; +constexpr float VCF::maxFrequency; +constexpr float VCF::minFrequency; + +} diff --git a/plugins/Makefile b/plugins/Makefile index 08199f24..c2694394 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -595,6 +595,7 @@ BISET_CUSTOM = Blank ButtonTrigger Clock Tree TreeDisplay PLUGIN_FILES += $(filter-out BogaudioModules/src/bogaudio.cpp,$(wildcard BogaudioModules/src/*.cpp)) PLUGIN_FILES += $(wildcard BogaudioModules/src/dsp/*.cpp) PLUGIN_FILES += $(wildcard BogaudioModules/src/dsp/filters/*.cpp) +PLUGIN_FILES += BogaudioModules-helper/BogaudioModules-helper.cpp MINIPLUGIN_FILES += BogaudioModules/src/AD.cpp MINIPLUGIN_FILES += BogaudioModules/src/LFO.cpp @@ -634,7 +635,7 @@ MINIPLUGIN_FILES += BogaudioModules/src/dsp/filters/resample.cpp # modules/types which are present in other plugins BOGAUDIO_CUSTOM = ADSR BlueNoiseGenerator LFO Noise VCA VCO VCF -BOGAUDIO_CUSTOM_PER_FILE = ARQuantity AttackMenuItem ReleaseMenuItem +BOGAUDIO_CUSTOM_PER_FILE = ARQuantity ARSlider AttackMenuItem ReleaseMenuItem # -------------------------------------------------------------- # ChowDSP @@ -2265,19 +2266,7 @@ $(BUILD_DIR)/Biset/src/%.cpp.o: Biset/src/%.cpp $(foreach m,$(BISET_CUSTOM),$(call custom_module_names,$(m),Biset)) \ -DpluginInstance=pluginInstance__Biset -$(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 \ - -DSKIP_MINGW_FORMAT \ - -IBogaudioModules/lib \ - -IBogaudioModules/src/dsp - -$(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp +$(BUILD_DIR)/BogaudioModules%.cpp.o: BogaudioModules%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index cad31aab..2ee4c73b 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -27,16 +27,6 @@ void refreshTheme(); #include "nanovg.h" -// fix bogaudio build, another missing symbol -#ifndef NDEBUG -namespace bogaudio { -struct FollowerBase { - static float efGainMaxDecibelsDebug; -}; -float FollowerBase::efGainMaxDecibelsDebug = 12.0f; -} -#endif - // Special nvgRGB for blank panels extern "C" { NVGcolor nvgRGBblank(const unsigned char r, const unsigned char g, const unsigned char b)