diff --git a/plugins/community/repos/Bidoo/makefile.linux b/plugins/community/repos/Bidoo/makefile.linux index fbcc5b7f..8a1c7702 100644 --- a/plugins/community/repos/Bidoo/makefile.linux +++ b/plugins/community/repos/Bidoo/makefile.linux @@ -1,6 +1,6 @@ SLUG=Bidoo -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk EXTRAFLAGS+= -DUSE_KISS_FFT -Idep/include -I./src/dep/audiofile -I./src/dep/filters -I./src/dep/freeverb \ -I./src/dep/gist/libs/kiss_fft130 -I./src/dep/gist/src -I./src/dep/minimp3\ @@ -9,4 +9,9 @@ EXTRAFLAGS+= -DUSE_KISS_FFT -Idep/include -I./src/dep/audiofile -I./src/dep/filt include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/Bidoo/makefile.msvc b/plugins/community/repos/Bidoo/makefile.msvc index e26b5767..e5335f5a 100644 --- a/plugins/community/repos/Bidoo/makefile.msvc +++ b/plugins/community/repos/Bidoo/makefile.msvc @@ -1,6 +1,6 @@ SLUG=Bidoo -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk EXTRAFLAGS+= -DUSE_KISS_FFT -Idep/include -I./src/dep/audiofile -I./src/dep/filters -I./src/dep/freeverb \ -I./src/dep/gist/libs/kiss_fft130 -I./src/dep/gist/src -I./src/dep/minimp3\ @@ -9,4 +9,9 @@ EXTRAFLAGS+= -DUSE_KISS_FFT -Idep/include -I./src/dep/audiofile -I./src/dep/filt include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/Bidoo/src/Bidoo.hpp b/plugins/community/repos/Bidoo/src/Bidoo.hpp index 03461350..90a15c41 100644 --- a/plugins/community/repos/Bidoo/src/Bidoo.hpp +++ b/plugins/community/repos/Bidoo/src/Bidoo.hpp @@ -18,6 +18,6 @@ const NVGcolor GREEN_BIDOO = nvgRGBA(2, 195, 154, 255); RACK_PLUGIN_DECLARE(Bidoo); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "Bidoo" #endif // USE_VST2 diff --git a/plugins/community/repos/EH_modules/makefile.linux b/plugins/community/repos/EH_modules/makefile.linux index 2f5a9cef..8eda6e37 100644 --- a/plugins/community/repos/EH_modules/makefile.linux +++ b/plugins/community/repos/EH_modules/makefile.linux @@ -1,9 +1,14 @@ SLUG=EH_modules -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk include make.objects ALL_OBJ= $(COMMON_OBJ) -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/EH_modules/makefile.msvc b/plugins/community/repos/EH_modules/makefile.msvc index 5e76aa56..dc158a07 100644 --- a/plugins/community/repos/EH_modules/makefile.msvc +++ b/plugins/community/repos/EH_modules/makefile.msvc @@ -1,9 +1,14 @@ SLUG=EH_modules -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk include make.objects ALL_OBJ= $(COMMON_OBJ) $(WIN32_OBJ) -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/EH_modules/src/EH_modules.h b/plugins/community/repos/EH_modules/src/EH_modules.h index 7add76ab..68a1d9f2 100644 --- a/plugins/community/repos/EH_modules/src/EH_modules.h +++ b/plugins/community/repos/EH_modules/src/EH_modules.h @@ -4,6 +4,6 @@ using namespace rack; RACK_PLUGIN_DECLARE(EH_modules); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "EH_modules" #endif // USE_VST2 diff --git a/plugins/community/repos/Edge/makefile.linux b/plugins/community/repos/Edge/makefile.linux index 61b7a207..97335874 100644 --- a/plugins/community/repos/Edge/makefile.linux +++ b/plugins/community/repos/Edge/makefile.linux @@ -1,7 +1,12 @@ SLUG=Edge -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/Edge/makefile.msvc b/plugins/community/repos/Edge/makefile.msvc index 4ac4b350..e3409226 100644 --- a/plugins/community/repos/Edge/makefile.msvc +++ b/plugins/community/repos/Edge/makefile.msvc @@ -1,7 +1,12 @@ SLUG=Edge -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/Edge/src/Edge.hpp b/plugins/community/repos/Edge/src/Edge.hpp index b5eb0e54..e43b7c7f 100644 --- a/plugins/community/repos/Edge/src/Edge.hpp +++ b/plugins/community/repos/Edge/src/Edge.hpp @@ -7,7 +7,7 @@ namespace rack_plugin_Edge { RACK_PLUGIN_DECLARE(Edge); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "Edge" #endif // USE_VST2 diff --git a/plugins/community/repos/JE/makefile.linux b/plugins/community/repos/JE/makefile.linux index 7824501b..d8802de9 100644 --- a/plugins/community/repos/JE/makefile.linux +++ b/plugins/community/repos/JE/makefile.linux @@ -1,9 +1,14 @@ SLUG=JE -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk CPPFLAGS+= -Iext/LambertW/ include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/JE/makefile.msvc b/plugins/community/repos/JE/makefile.msvc index 418e34e7..e1c6da29 100644 --- a/plugins/community/repos/JE/makefile.msvc +++ b/plugins/community/repos/JE/makefile.msvc @@ -1,9 +1,14 @@ SLUG=JE -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk CPPFLAGS+= -Iext/LambertW/ include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/JE/src/JE.hpp b/plugins/community/repos/JE/src/JE.hpp index 0f4eb864..e64f8088 100644 --- a/plugins/community/repos/JE/src/JE.hpp +++ b/plugins/community/repos/JE/src/JE.hpp @@ -4,4 +4,8 @@ using namespace rack; RACK_PLUGIN_DECLARE(JE); + +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "JE" +#endif + diff --git a/plugins/community/repos/LindenbergResearch/makefile.linux b/plugins/community/repos/LindenbergResearch/makefile.linux index c0efa98a..3fc2e457 100644 --- a/plugins/community/repos/LindenbergResearch/makefile.linux +++ b/plugins/community/repos/LindenbergResearch/makefile.linux @@ -1,7 +1,12 @@ SLUG=LindenbergResearch -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/LindenbergResearch/makefile.msvc b/plugins/community/repos/LindenbergResearch/makefile.msvc index 250e24aa..3cea0544 100644 --- a/plugins/community/repos/LindenbergResearch/makefile.msvc +++ b/plugins/community/repos/LindenbergResearch/makefile.msvc @@ -1,7 +1,12 @@ SLUG=LindenbergResearch -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/LindenbergResearch/src/LRComponents.hpp b/plugins/community/repos/LindenbergResearch/src/LRComponents.hpp index 078fc0f6..f5e3aa6d 100644 --- a/plugins/community/repos/LindenbergResearch/src/LRComponents.hpp +++ b/plugins/community/repos/LindenbergResearch/src/LRComponents.hpp @@ -31,11 +31,11 @@ using std::string; using std::map; -#ifdef USE_VST2 -#define plugin "LindenbergResearch" -#else -extern Plugin *plugin; -#endif // USE_VST2 +// // #ifdef USE_VST2 +// // #define plugin "LindenbergResearch" +// // #else +// // extern Plugin *plugin; +// // #endif // USE_VST2 namespace lrt { @@ -167,7 +167,7 @@ struct LRCVIndicator : TransparentWidget { struct LRShadow : TransparentWidget { private: Rect box; - float size = 0.65; + float size = 0.65f; float strength = 1.f; /** shadow shift */ @@ -223,7 +223,7 @@ private: /** position to snap */ float snapAt = 0.0f; /** snap sensitivity */ - float snapSens = 0.1; + float snapSens = 0.1f; protected: /** shader */ @@ -426,7 +426,7 @@ struct LRMiddleIncremental : LRKnob { void onChange(EventChange &e) override { - value = lround(value); + value = (float)lround(value); //value = round(value); SVGKnob::onChange(e); @@ -453,21 +453,21 @@ struct LRBigKnob : LRKnob { switch (*gestalt) { case LRGestalt::DARK: setIndicatorDistance(15); - setIndicatorShape(4.8, 0.12); + setIndicatorShape(4.8f, 0.12f); shader->setShadowPosition(4, 5); shader->setStrength(0.8f); shader->setSize(.65f); break; case LRGestalt::LIGHT: setIndicatorDistance(17); - setIndicatorShape(4.1, 0.08); + setIndicatorShape(4.1f, 0.08f); shader->setShadowPosition(4, 5); shader->setStrength(0.5f); shader->setSize(0.6f); break; case LRGestalt::AGED: setIndicatorDistance(17); - setIndicatorShape(4.1, 0.08); + setIndicatorShape(4.1f, 0.08f); shader->setShadowPosition(4, 5); shader->setStrength(0.5f); shader->setSize(0.6f); @@ -498,21 +498,21 @@ struct LRMiddleKnob : LRKnob { switch (*gestalt) { case LRGestalt::DARK: setIndicatorDistance(13); - setIndicatorShape(5, 0.13); + setIndicatorShape(5.f, 0.13f); shader->setShadowPosition(2, 3); shader->setStrength(0.8f); shader->setSize(.65f); break; case LRGestalt::LIGHT: setIndicatorDistance(11); - setIndicatorShape(4.3, 0.11); + setIndicatorShape(4.3f, 0.11f); shader->setShadowPosition(2, 3); shader->setStrength(0.5f); shader->setSize(0.6f); break; case LRGestalt::AGED: setIndicatorDistance(11); - setIndicatorShape(4.3, 0.11); + setIndicatorShape(4.3f, 0.11f); shader->setShadowPosition(2, 3); shader->setStrength(0.5f); shader->setSize(0.6f); @@ -546,7 +546,7 @@ struct LRSmallKnob : LRKnob { switch (*gestalt) { case LRGestalt::DARK: setIndicatorDistance(13); - setIndicatorShape(5, 0.13); + setIndicatorShape(5.f, 0.13f); shader->setShadowPosition(3, 3); shader->setStrength(1.f); shader->setSize(.65f); @@ -574,7 +574,7 @@ struct LRSmallKnob : LRKnob { * @brief LR Small Knob */ struct LRSmallToggleKnob : LRKnob { - LRSmallToggleKnob(float length = 0.73) { + LRSmallToggleKnob(float length = 0.73f) { //TODO: parametrize start and end angle minAngle = -length * (float) M_PI; maxAngle = length * (float) M_PI; diff --git a/plugins/community/repos/LindenbergResearch/src/LRModule.cpp b/plugins/community/repos/LindenbergResearch/src/LRModule.cpp index 83e6e920..5d29b72c 100644 --- a/plugins/community/repos/LindenbergResearch/src/LRModule.cpp +++ b/plugins/community/repos/LindenbergResearch/src/LRModule.cpp @@ -1,3 +1,4 @@ +#include "LindenbergResearch.hpp" #include "LRComponents.hpp" #include "LRModel.hpp" diff --git a/plugins/community/repos/LindenbergResearch/src/LRModuleWidget.cpp b/plugins/community/repos/LindenbergResearch/src/LRModuleWidget.cpp index 2cd8b014..abf8819c 100644 --- a/plugins/community/repos/LindenbergResearch/src/LRModuleWidget.cpp +++ b/plugins/community/repos/LindenbergResearch/src/LRModuleWidget.cpp @@ -1,3 +1,4 @@ +#include "LindenbergResearch.hpp" #include "LRComponents.hpp" #include "LRModel.hpp" diff --git a/plugins/community/repos/LindenbergResearch/src/LindenbergResearch.hpp b/plugins/community/repos/LindenbergResearch/src/LindenbergResearch.hpp index 83838d8d..a62786e1 100644 --- a/plugins/community/repos/LindenbergResearch/src/LindenbergResearch.hpp +++ b/plugins/community/repos/LindenbergResearch/src/LindenbergResearch.hpp @@ -2,14 +2,15 @@ #include #include "rack.hpp" -#include "asset.hpp" -#include "widgets.hpp" -#include "LRComponents.hpp" using namespace rack; RACK_PLUGIN_DECLARE(LindenbergResearch); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "LindenbergResearch" #endif // USE_VST2 + +#include "asset.hpp" +#include "widgets.hpp" +#include "LRComponents.hpp" diff --git a/plugins/community/repos/LindenbergResearch/src/dsp/DSPEffect.hpp b/plugins/community/repos/LindenbergResearch/src/dsp/DSPEffect.hpp index f0ce3c8f..00fb61af 100644 --- a/plugins/community/repos/LindenbergResearch/src/dsp/DSPEffect.hpp +++ b/plugins/community/repos/LindenbergResearch/src/dsp/DSPEffect.hpp @@ -124,7 +124,7 @@ struct Decimator { index = (index + oversample * quality) % (oversample * quality); out += kernel[i] * inBuffer[index]; } - return out; + return float(out); } }; @@ -163,12 +163,12 @@ struct Upsampler { // Naively convolve each sample // TODO replace with polyphase lpf hierarchy for (int i = 0; i < oversample; i++) { - float y = 0.0; + float y = 0.0f; for (int j = 0; j < quality; j++) { int index = inIndex - 1 - j; index = (index + quality) % quality; int kernelIndex = oversample * j + i; - y += kernel[kernelIndex] * inBuffer[index]; + y += float(kernel[kernelIndex] * inBuffer[index]); } out[i] = y; } @@ -258,4 +258,4 @@ struct Resampler { } }; -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/dsp/DSPMath.hpp b/plugins/community/repos/LindenbergResearch/src/dsp/DSPMath.hpp index adf42e8e..7532b641 100644 --- a/plugins/community/repos/LindenbergResearch/src/dsp/DSPMath.hpp +++ b/plugins/community/repos/LindenbergResearch/src/dsp/DSPMath.hpp @@ -8,7 +8,7 @@ using namespace rack; -const static float PI = 3.1415926535897932384626433832795; +const static float PI = 3.1415926535897932384626433832795f; const static float TWOPI = PI * 2.f; namespace dsp { @@ -498,8 +498,8 @@ inline double erf(const double x) { inline float fastlog2(float x) // compute log2(x) by reducing x to [0.75, 1.5) { // a*(x-1)^2 + b*(x-1) approximates log2(x) when 0.75 <= x < 1.5 - const float a = -.6296735; - const float b = 1.466967; + const float a = -.6296735f; + const float b = 1.466967f; float signif, fexp; int exp; float lg2; @@ -524,15 +524,15 @@ inline float fastlog2(float x) // compute log2(x) by reducing x to [0.75, 1.5) // stuffing exp = 126 which corresponds to an exponent of -1 ux2.i = (ux1.i & 0x007FFFFF) | 0x3f000000; signif = ux2.f; - fexp = exp - 126; // 126 instead of 127 compensates for division by 2 - signif = signif - 1.0; // < + fexp = float(exp - 126); // 126 instead of 127 compensates for division by 2 + signif = signif - 1.0f; // < lg2 = fexp + a * signif * signif + b * signif; // < } else { // get signif by stuffing exp = 127 which corresponds to an exponent of 0 ux2.i = (ux1.i & 0x007FFFFF) | 0x3f800000; signif = ux2.f; - fexp = exp - 127; - signif = signif - 1.0; // <<-- + fexp = float(exp - 127); + signif = signif - 1.0f; // <<-- lg2 = fexp + a * signif * signif + b * signif; // <<-- } // lines marked <<-- are common code, but optimize better @@ -565,7 +565,7 @@ inline float fastPow(float a, float b) { } u = {a}; u.x[1] = (int) (b * (u.x[1] - 1072632447) + 1072632447); u.x[0] = 0; - return u.d; + return float(u.d); } diff --git a/plugins/community/repos/LindenbergResearch/src/modules/AlmaFilter.cpp b/plugins/community/repos/LindenbergResearch/src/modules/AlmaFilter.cpp index 7a98ffe5..b0b49635 100644 --- a/plugins/community/repos/LindenbergResearch/src/modules/AlmaFilter.cpp +++ b/plugins/community/repos/LindenbergResearch/src/modules/AlmaFilter.cpp @@ -1,5 +1,5 @@ -#include "../dsp/LadderFilter.hpp" #include "../LindenbergResearch.hpp" +#include "../dsp/LadderFilter.hpp" #include "../LRModel.hpp" namespace rack_plugin_LindenbergResearch { diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/FontIconWidget.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/FontIconWidget.cpp index 6a2284d3..90751dc9 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/FontIconWidget.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/FontIconWidget.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" #define ICON_FONT_GLYPHYX "res/GlyphyxOneNF.ttf" diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRCVIndicator.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRCVIndicator.cpp index 20de7b01..e938a91d 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRCVIndicator.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRCVIndicator.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" @@ -72,4 +73,4 @@ void LRCVIndicator::setDistances(float d1, float d2) { } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRGradientWidget.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRGradientWidget.cpp index edf15021..017eb35b 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRGradientWidget.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRGradientWidget.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" namespace lrt { @@ -36,4 +37,4 @@ void LRGradientWidget::setOuterColor(const NVGcolor &outerColor) { LRGradientWidget::outerColor = outerColor; } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRKnob.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRKnob.cpp index 570571bc..d252b882 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRKnob.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRKnob.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" @@ -108,4 +109,4 @@ void LRKnob::onGestaltChange(LREventGestaltChange &e) { e.consumed = true; } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRLCDWidget.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRLCDWidget.cpp index 11ce8cf6..87514318 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRLCDWidget.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRLCDWidget.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" #include "../LRModel.hpp" @@ -187,4 +188,4 @@ void LRLCDWidget::step() { FramebufferWidget::step(); } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRLight.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRLight.cpp index a1359a70..b1859a68 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRLight.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRLight.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" namespace lrt { @@ -81,4 +82,4 @@ void LRLight::onGestaltChange(LREventGestaltChange &e) { } } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRPanel.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRPanel.cpp index 678a13e5..b4b9dd85 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRPanel.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRPanel.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include #include #include diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRPatinaWidget.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRPatinaWidget.cpp index e7577bca..7e1f8275 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRPatinaWidget.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRPatinaWidget.cpp @@ -15,6 +15,7 @@ ** with or without modification please see LICENSE. ** ** ** \* */ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" using namespace lrt; diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRSVGRotator.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRSVGRotator.cpp index 1b01f482..2efaa855 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRSVGRotator.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRSVGRotator.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" namespace lrt { @@ -46,4 +47,4 @@ void SVGRotator::draw(NVGcontext *vg) { nvgGlobalAlpha(vg, transperency); FramebufferWidget::draw(vg); } -} \ No newline at end of file +} diff --git a/plugins/community/repos/LindenbergResearch/src/widgets/LRShadow.cpp b/plugins/community/repos/LindenbergResearch/src/widgets/LRShadow.cpp index 667f5a21..3c9853c6 100644 --- a/plugins/community/repos/LindenbergResearch/src/widgets/LRShadow.cpp +++ b/plugins/community/repos/LindenbergResearch/src/widgets/LRShadow.cpp @@ -1,3 +1,4 @@ +#include "../LindenbergResearch.hpp" #include "../LRComponents.hpp" namespace lrt { diff --git a/plugins/community/repos/SonusModular/makefile.linux b/plugins/community/repos/SonusModular/makefile.linux index a8807906..26549096 100644 --- a/plugins/community/repos/SonusModular/makefile.linux +++ b/plugins/community/repos/SonusModular/makefile.linux @@ -1,7 +1,12 @@ SLUG=SonusModular -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/SonusModular/makefile.msvc b/plugins/community/repos/SonusModular/makefile.msvc index 1a9133d2..d469b756 100644 --- a/plugins/community/repos/SonusModular/makefile.msvc +++ b/plugins/community/repos/SonusModular/makefile.msvc @@ -1,7 +1,12 @@ SLUG=SonusModular -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/SonusModular/src/sonusmodular.hpp b/plugins/community/repos/SonusModular/src/sonusmodular.hpp index 1e33e597..902928ad 100644 --- a/plugins/community/repos/SonusModular/src/sonusmodular.hpp +++ b/plugins/community/repos/SonusModular/src/sonusmodular.hpp @@ -31,7 +31,7 @@ namespace rack_plugin_SonusModular { RACK_PLUGIN_DECLARE(SonusModular); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "SonusModular" #endif // USE_VST2 diff --git a/plugins/community/repos/Valley/makefile.linux b/plugins/community/repos/Valley/makefile.linux index 57ecd70e..e75d1b13 100644 --- a/plugins/community/repos/Valley/makefile.linux +++ b/plugins/community/repos/Valley/makefile.linux @@ -1,9 +1,15 @@ SLUG=Valley -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk EXTRAFLAGS+= include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk + diff --git a/plugins/community/repos/Valley/makefile.msvc b/plugins/community/repos/Valley/makefile.msvc index 953f65d8..96190070 100644 --- a/plugins/community/repos/Valley/makefile.msvc +++ b/plugins/community/repos/Valley/makefile.msvc @@ -1,9 +1,14 @@ SLUG=Valley -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk EXTRAFLAGS+= -wo4838 -wo4305 include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/Valley/src/Valley.hpp b/plugins/community/repos/Valley/src/Valley.hpp index d64ff51e..0440b0c2 100644 --- a/plugins/community/repos/Valley/src/Valley.hpp +++ b/plugins/community/repos/Valley/src/Valley.hpp @@ -4,12 +4,9 @@ using namespace rack; #include // setprecision #include // stringstream #define VALLEY_NAME "ValleyDev" -namespace rack_plugin_Valley { RACK_PLUGIN_DECLARE(Valley); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "Valley" #endif // USE_VST2 - -} diff --git a/plugins/community/repos/rcm/makefile.linux b/plugins/community/repos/rcm/makefile.linux index f0040fb8..a01680bc 100644 --- a/plugins/community/repos/rcm/makefile.linux +++ b/plugins/community/repos/rcm/makefile.linux @@ -1,7 +1,12 @@ SLUG=rcm -include ../../../build_plugin_pre_linux.mk +include ../../../build_shared_plugin_pre_linux.mk include make.objects -include ../../../build_plugin_post_linux.mk +define BIN_POST_FXN + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.fx + cp -f $(SLUG).so ../../../../vst2_bin/plugins/$(SLUG)/plugin.so.instr +endef + +include ../../../build_shared_plugin_post_linux.mk diff --git a/plugins/community/repos/rcm/makefile.msvc b/plugins/community/repos/rcm/makefile.msvc index 08f1bd18..16c13baf 100644 --- a/plugins/community/repos/rcm/makefile.msvc +++ b/plugins/community/repos/rcm/makefile.msvc @@ -1,7 +1,12 @@ SLUG=rcm -include ../../../build_plugin_pre_msvc.mk +include ../../../build_shared_plugin_pre_msvc.mk include make.objects -include ../../../build_plugin_post_msvc.mk +define BIN_POST_FXN + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.fx + cp -f $(SLUG).dll ../../../../vst2_bin/plugins/$(SLUG)/plugin.dll.instr +endef + +include ../../../build_shared_plugin_post_msvc.mk diff --git a/plugins/community/repos/rcm/src/rcm.h b/plugins/community/repos/rcm/src/rcm.h index 45aaf6ac..28a28065 100644 --- a/plugins/community/repos/rcm/src/rcm.h +++ b/plugins/community/repos/rcm/src/rcm.h @@ -9,7 +9,7 @@ namespace rack_plugin_rcm { RACK_PLUGIN_DECLARE(rcm); -#ifdef USE_VST2 +#if defined(USE_VST2) && !defined(RACK_PLUGIN_SHARED) #define plugin "rcm" #endif // USE_VST2 diff --git a/src/plugin_static.cpp b/src/plugin_static.cpp index 3720b86e..5fc8f914 100644 --- a/src/plugin_static.cpp +++ b/src/plugin_static.cpp @@ -167,7 +167,7 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("BaconMusic", &init_plugin_BaconMusic); vst2_load_static_rack_plugin("Bark", &init_plugin_Bark); vst2_load_static_rack_plugin("Befaco", &init_plugin_Befaco); - vst2_load_static_rack_plugin("Bidoo", &init_plugin_Bidoo); + // vst2_load_static_rack_plugin("Bidoo", &init_plugin_Bidoo); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("Bogaudio", &init_plugin_Bogaudio); // vst2_load_static_rack_plugin("bsp", &init_plugin_bsp); // contains GPLv3 code from Ob-Xd (Obxd_VCF) // vst2_load_static_rack_plugin("BOKONTEPByteBeatMachine", &init_plugin_BOKONTEPByteBeatMachine); @@ -178,8 +178,8 @@ void vst2_load_static_rack_plugins(void) { // vst2_load_static_rack_plugin("dBiz", &init_plugin_dBiz); // now a DLL (13Jul2018) vst2_load_static_rack_plugin("DHE-Modules", &init_plugin_DHE_Modules); vst2_load_static_rack_plugin("DrumKit", &init_plugin_DrumKit); - vst2_load_static_rack_plugin("Edge", &init_plugin_Edge); - vst2_load_static_rack_plugin("EH_modules", &init_plugin_EH_modules); + // vst2_load_static_rack_plugin("Edge", &init_plugin_Edge); // now a DLL (22May2019) (GPL code) + // vst2_load_static_rack_plugin("EH_modules", &init_plugin_EH_modules); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("ErraticInstruments", &init_plugin_ErraticInstruments); vst2_load_static_rack_plugin("ESeries", &init_plugin_ESeries); vst2_load_static_rack_plugin("FrankBussFormula", &init_plugin_FrankBussFormula); @@ -190,11 +190,11 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("HetrickCV", &init_plugin_HetrickCV); vst2_load_static_rack_plugin("huaba", &init_plugin_huaba); vst2_load_static_rack_plugin("ImpromptuModular", &init_plugin_ImpromptuModular); - vst2_load_static_rack_plugin("JE", &init_plugin_JE); + // vst2_load_static_rack_plugin("JE", &init_plugin_JE); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("JW_Modules", &init_plugin_JW_Modules); vst2_load_static_rack_plugin("Koralfx-Modules", &init_plugin_Koralfx); vst2_load_static_rack_plugin("LabSeven", &init_plugin_LabSeven); - vst2_load_static_rack_plugin("LindenbergResearch", &init_plugin_LindenbergResearch); + // vst2_load_static_rack_plugin("LindenbergResearch", &init_plugin_LindenbergResearch); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("LOGinstruments", &init_plugin_LOGinstruments); vst2_load_static_rack_plugin("mental", &init_plugin_mental); vst2_load_static_rack_plugin("MicMusic", &init_plugin_MicMusic); @@ -212,11 +212,11 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("PvC", &init_plugin_PvC); vst2_load_static_rack_plugin("QuantalAudio", &init_plugin_QuantalAudio); vst2_load_static_rack_plugin("Qwelk", &init_plugin_Qwelk); - vst2_load_static_rack_plugin("rcm", &init_plugin_rcm); + // vst2_load_static_rack_plugin("rcm", &init_plugin_rcm); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("RJModules", &init_plugin_RJModules); vst2_load_static_rack_plugin("SerialRacker", &init_plugin_SerialRacker); vst2_load_static_rack_plugin("Skylights", &init_plugin_Skylights); - vst2_load_static_rack_plugin("SonusModular", &init_plugin_SonusModular); + // vst2_load_static_rack_plugin("SonusModular", &init_plugin_SonusModular); // now a DLL (22May2019) (GPL code) vst2_load_static_rack_plugin("Southpole", &init_plugin_Southpole); vst2_load_static_rack_plugin("Southpole_parasites", &init_plugin_Southpole_parasites); vst2_load_static_rack_plugin("squinkylabs-plug1", &init_plugin_squinkylabs_plug1); @@ -227,7 +227,7 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("TheXOR", &init_plugin_TheXOR); vst2_load_static_rack_plugin("trowaSoft", &init_plugin_trowaSoft); vst2_load_static_rack_plugin("unless_modules", &init_plugin_unless_modules); - vst2_load_static_rack_plugin("Valley", &init_plugin_Valley); + // vst2_load_static_rack_plugin("Valley", &init_plugin_Valley); // now a DLL (22May2019) (GPL code) // vst2_load_static_rack_plugin("VultModules", &init_plugin_VultModules); #else vst2_load_static_rack_plugin("Template", &init_plugin_Template); diff --git a/vst2_common_staticlibs.mk b/vst2_common_staticlibs.mk index 16875331..4a854dfa 100644 --- a/vst2_common_staticlibs.mk +++ b/vst2_common_staticlibs.mk @@ -10,7 +10,7 @@ EXTRALIBS+= $(call plugin_lib,Autodafe) EXTRALIBS+= $(call plugin_lib,BaconMusic) EXTRALIBS+= $(call plugin_lib,Bark) EXTRALIBS+= $(call plugin_lib,Befaco) -EXTRALIBS+= $(call plugin_lib,Bidoo) +#EXTRALIBS+= $(call plugin_lib,Bidoo) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,Bogaudio) #EXTRALIBS+= $(call plugin_lib,bsp) # contains GPLv3 code from Ob-Xd (Obxd_VCF) #EXTRALIBS+= $(call plugin_lib,BOKONTEPByteBeatMachine) # unstable @@ -21,8 +21,8 @@ EXTRALIBS+= $(call plugin_lib,computerscare) #EXTRALIBS+= $(call plugin_lib,dBiz) # now a DLL (13Jul2018) EXTRALIBS+= $(call plugin_lib,DHE-Modules) EXTRALIBS+= $(call plugin_lib,DrumKit) -EXTRALIBS+= $(call plugin_lib,Edge) -EXTRALIBS+= $(call plugin_lib,EH_modules) +#EXTRALIBS+= $(call plugin_lib,Edge) # now a DLL (22May2019) +#EXTRALIBS+= $(call plugin_lib,EH_modules) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,ErraticInstruments) EXTRALIBS+= $(call plugin_lib,ESeries) EXTRALIBS+= $(call plugin_lib,FrankBussFormula) @@ -33,11 +33,11 @@ EXTRALIBS+= $(call plugin_lib,Gratrix) EXTRALIBS+= $(call plugin_lib,HetrickCV) EXTRALIBS+= $(call plugin_lib,huaba) EXTRALIBS+= $(call plugin_lib,ImpromptuModular) -EXTRALIBS+= $(call plugin_lib,JE) +#EXTRALIBS+= $(call plugin_lib,JE) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,JW-Modules) EXTRALIBS+= $(call plugin_lib,Koralfx-Modules) EXTRALIBS+= $(call plugin_lib,LabSeven) -EXTRALIBS+= $(call plugin_lib,LindenbergResearch) +#EXTRALIBS+= $(call plugin_lib,LindenbergResearch) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,LOGinstruments) EXTRALIBS+= $(call plugin_lib,mental) EXTRALIBS+= $(call plugin_lib,MicMusic) @@ -55,11 +55,11 @@ EXTRALIBS+= $(call plugin_lib,PG-Instruments) EXTRALIBS+= $(call plugin_lib,PvC) EXTRALIBS+= $(call plugin_lib,QuantalAudio) EXTRALIBS+= $(call plugin_lib,Qwelk) -EXTRALIBS+= $(call plugin_lib,rcm) +#EXTRALIBS+= $(call plugin_lib,rcm) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,RJModules) EXTRALIBS+= $(call plugin_lib,SerialRacker) EXTRALIBS+= $(call plugin_lib,Skylights) -EXTRALIBS+= $(call plugin_lib,SonusModular) +#EXTRALIBS+= $(call plugin_lib,SonusModular) # now a DLL (22May2019) EXTRALIBS+= $(call plugin_lib,Southpole) EXTRALIBS+= $(call plugin_lib,Southpole-parasites) EXTRALIBS+= $(call plugin_lib,squinkylabs-plug1) @@ -70,5 +70,5 @@ EXTRALIBS+= $(call plugin_lib,Template) EXTRALIBS+= $(call plugin_lib,TheXOR) EXTRALIBS+= $(call plugin_lib,trowaSoft) EXTRALIBS+= $(call plugin_lib,unless_modules) -EXTRALIBS+= $(call plugin_lib,Valley) +#EXTRALIBS+= $(call plugin_lib,Valley) # now a DLL (22May2019) #EXTRALIBS+= $(call plugin_lib,VultModules)