diff --git a/Makefile b/Makefile index c9f010f..6acfa09 100644 --- a/Makefile +++ b/Makefile @@ -223,6 +223,9 @@ lv2: carla deps dgl plugins resources vst2: carla deps dgl plugins resources $(MAKE) vst2 -C src $(CARLA_EXTRA_ARGS) +vst2fx: carla deps dgl plugins resources + $(MAKE) vst2fx -C src $(CARLA_EXTRA_ARGS) + vst3: carla deps dgl plugins resources $(MAKE) vst3 -C src $(CARLA_EXTRA_ARGS) diff --git a/plugins/Makefile b/plugins/Makefile index d929601..6bfbfca 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1023,7 +1023,7 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular.cpp,$(wildcard sonusm # -------------------------------------------------------------- # Starling Via -PLUGIN_FILES += $(wildcard StarlingVia/src/*.cpp) +PLUGIN_FILES += $(filter-out StarlingVia/src/starling.cpp,$(wildcard StarlingVia/src/*.cpp)) PLUGIN_FILES += $(wildcard StarlingVia/Via/io/src/*.cpp) PLUGIN_FILES += $(wildcard StarlingVia/Via/ui/src/*.cpp) PLUGIN_FILES += $(wildcard StarlingVia/Via/modules/*/*.cpp) @@ -1445,6 +1445,7 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes RESOURCE_FILES += Mog/res RESOURCE_FILES += nonlinearcircuits/res RESOURCE_FILES += ParableInstruments/res/Neil.png +RESOURCE_FILES += $(wildcard StarlingVia/res/original.*) RESOURCE_FILES += surgext/build/surge-data/configuration.xml RESOURCE_FILES += surgext/build/surge-data/fx_presets RESOURCE_FILES += surgext/build/surge-data/wavetables diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 3bb4372..899df1d 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -811,7 +811,6 @@ void addThemeMenuItems(Menu*, ModuleTheme*) {} // sonusmodular #include "sonusmodular/src/sonusmodular.hpp" - // Starling Via #define modelScanner modelStarlingViaScanner #define Scale starlingViaScale @@ -954,7 +953,7 @@ Plugin* pluginInstance__RebelTech; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sapphire; Plugin* pluginInstance__sonusmodular; -extern Plugin* pluginInstance__StarlingVia; +Plugin* pluginInstance__StarlingVia; Plugin* pluginInstance__stocaudio; extern Plugin* pluginInstance__stoermelder_p1; Plugin* pluginInstance__surgext; @@ -3070,7 +3069,6 @@ static void initStatic__sonusmodular() } } - static void initStatic__StarlingVia() { Plugin* const p = new Plugin; diff --git a/src/Makefile b/src/Makefile index 805cdfe..24038a8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -152,6 +152,9 @@ vst2: $(TARGETS) $(MAKE) vst2 -C CardinalFX $(CARDINAL_FX_ARGS) $(MAKE) vst2 -C CardinalSynth $(CARDINAL_SYNTH_ARGS) +vst2fx: $(TARGETS) + $(MAKE) vst2 -C CardinalFX $(CARDINAL_FX_ARGS) + vst3: $(TARGETS) $(MAKE) vst3 -C Cardinal $(MAKE) vst3 -C CardinalFX $(CARDINAL_FX_ARGS)