Build all plugins without UI; Other minor changes

12 files changed, 57 insertions, 11 deletions

diff --git a/libs/distrho/src/DistrhoPluginVST.cpp b/libs/distrho/src/DistrhoPluginVST.cpp
index 98a17a9..e1fe00b 100644
--- a/libs/distrho/src/DistrhoPluginVST.cpp
+++ b/libs/distrho/src/DistrhoPluginVST.cpp
@@ -723,18 +723,22 @@ private:
     // -------------------------------------------------------------------
     // functions called from the plugin side, RT no block
 
+#if DISTRHO_PLUGIN_HAS_UI
     void setParameterValueFromPlugin(const uint32_t index, const float realValue)
     {
         parameterValues[index] = realValue;
         parameterChecks[index] = true;
     }
+#endif
 
 #if DISTRHO_PLUGIN_WANT_PROGRAMS
     void setProgramFromPlugin(const uint32_t index)
     {
+# if DISTRHO_PLUGIN_HAS_UI
         // set previous parameters invalid
         for (uint32_t i=0, count = fPlugin.getParameterCount(); i < count; ++i)
             parameterChecks[i] = false;
+# endif
 
         nextProgram = index;
     }
diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk
index a0ecbf2..d427763 100644
--- a/plugins/Makefile.mk
+++ b/plugins/Makefile.mk
@@ -38,6 +38,23 @@ endif
 # TODO: MacOS VST bundle
 
 # --------------------------------------------------------------
+# Set distrho code files
+
+DISTRHO_PLUGIN_FILES = ../../libs/distrho/DistrhoPluginMain.cpp
+DISTRHO_UI_FILES     = ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
+
+# --------------------------------------------------------------
+# Handle plugins without UI
+
+ifeq ($(TARGET_NOUI),true)
+dssi_ui =
+lv2_ui =
+DISTRHO_UI_FILES =
+DGL_LIBS =
+OBJS_UI =
+endif
+
+# --------------------------------------------------------------
 # Common
 
 %.c.o: %.c
@@ -55,7 +72,7 @@ clean:
 
 ladspa: $(ladspa_dsp)
 
-$(ladspa_dsp): $(OBJS_DSP) ../../libs/distrho/DistrhoPluginMain.cpp
+$(ladspa_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
 
@@ -64,11 +81,11 @@ $(ladspa_dsp): $(OBJS_DSP) ../../libs/distrho/DistrhoPluginMain.cpp
 
 dssi: $(dssi_dsp) $(dssi_ui)
 
-$(dssi_dsp): $(OBJS_DSP) ../../libs/distrho/DistrhoPluginMain.cpp
+$(dssi_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
 
-$(dssi_ui): $(OBJS_UI) ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
+$(dssi_ui): $(OBJS_UI) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
 
@@ -77,11 +94,11 @@ $(dssi_ui): $(OBJS_UI) ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
 
 lv2: $(lv2_dsp) $(lv2_ui)
 
-$(lv2_dsp): $(OBJS_DSP) ../../libs/distrho/DistrhoPluginMain.cpp
+$(lv2_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
 
-$(lv2_ui): $(OBJS_UI) ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
+$(lv2_ui): $(OBJS_UI) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
 
@@ -90,7 +107,7 @@ $(lv2_ui): $(OBJS_UI) ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
 
 vst: $(vst)
 
-$(vst): $(OBJS_DSP) $(OBJS_UI) ../../libs/distrho/DistrhoPluginMain.cpp ../../libs/distrho/DistrhoUIMain.cpp ../../libs/libdgl.a
+$(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
 
diff --git a/plugins/ZaMultiComp/DistrhoPluginInfo.h b/plugins/ZaMultiComp/DistrhoPluginInfo.h
index a77ce65..3bd6d2a 100644
--- a/plugins/ZaMultiComp/DistrhoPluginInfo.h
+++ b/plugins/ZaMultiComp/DistrhoPluginInfo.h
@@ -20,7 +20,7 @@
 
 #define DISTRHO_PLUGIN_NAME "ZaMultiComp"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_SYNTH      0
 
 #define DISTRHO_PLUGIN_NUM_INPUTS    1
diff --git a/plugins/ZaMultiComp/Makefile b/plugins/ZaMultiComp/Makefile
index 9f8c25a..043f465 100644
--- a/plugins/ZaMultiComp/Makefile
+++ b/plugins/ZaMultiComp/Makefile
@@ -20,6 +20,11 @@ OBJS_UI  = \
 	ZaMultiCompUI.cpp.o
 
 # --------------------------------------------------------------
+# No custom UI for now
+
+TARGET_NOUI = true
+
+# --------------------------------------------------------------
 # Do some magic
 
 include ../Makefile.mk
diff --git a/plugins/ZaMultiCompX2/DistrhoPluginInfo.h b/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
index a42533c..eb6291e 100644
--- a/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
+++ b/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
@@ -20,7 +20,7 @@
 
 #define DISTRHO_PLUGIN_NAME "ZaMultiCompX2"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_SYNTH      0
 
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
diff --git a/plugins/ZaMultiCompX2/Makefile b/plugins/ZaMultiCompX2/Makefile
index 84e179c..67ac578 100644
--- a/plugins/ZaMultiCompX2/Makefile
+++ b/plugins/ZaMultiCompX2/Makefile
@@ -20,6 +20,11 @@ OBJS_UI  = \
 	ZaMultiCompX2UI.cpp.o
 
 # --------------------------------------------------------------
+# No custom UI for now
+
+TARGET_NOUI = true
+
+# --------------------------------------------------------------
 # Do some magic
 
 include ../Makefile.mk
diff --git a/plugins/ZamComp/DistrhoPluginInfo.h b/plugins/ZamComp/DistrhoPluginInfo.h
index b164eff..7fb1672 100644
--- a/plugins/ZamComp/DistrhoPluginInfo.h
+++ b/plugins/ZamComp/DistrhoPluginInfo.h
@@ -20,7 +20,7 @@
 
 #define DISTRHO_PLUGIN_NAME "ZamComp"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_SYNTH      0
 
 #define DISTRHO_PLUGIN_NUM_INPUTS    1
diff --git a/plugins/ZamComp/Makefile b/plugins/ZamComp/Makefile
index 1dae490..9342b91 100644
--- a/plugins/ZamComp/Makefile
+++ b/plugins/ZamComp/Makefile
@@ -20,6 +20,11 @@ OBJS_UI  = \
 	ZamCompUI.cpp.o
 
 # --------------------------------------------------------------
+# No custom UI for now
+
+TARGET_NOUI = true
+
+# --------------------------------------------------------------
 # Do some magic
 
 include ../Makefile.mk
diff --git a/plugins/ZamCompX2/DistrhoPluginInfo.h b/plugins/ZamCompX2/DistrhoPluginInfo.h
index a6faeb2..32eedac 100644
--- a/plugins/ZamCompX2/DistrhoPluginInfo.h
+++ b/plugins/ZamCompX2/DistrhoPluginInfo.h
@@ -20,7 +20,7 @@
 
 #define DISTRHO_PLUGIN_NAME "ZamCompX2"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_SYNTH      0
 
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
diff --git a/plugins/ZamCompX2/Makefile b/plugins/ZamCompX2/Makefile
index bece0ae..400b054 100644
--- a/plugins/ZamCompX2/Makefile
+++ b/plugins/ZamCompX2/Makefile
@@ -20,6 +20,11 @@ OBJS_UI  = \
 	ZamCompX2UI.cpp.o
 
 # --------------------------------------------------------------
+# No custom UI for now
+
+TARGET_NOUI = true
+
+# --------------------------------------------------------------
 # Do some magic
 
 include ../Makefile.mk
diff --git a/plugins/ZamTube/DistrhoPluginInfo.h b/plugins/ZamTube/DistrhoPluginInfo.h
index 0864acc..5b01eef 100644
--- a/plugins/ZamTube/DistrhoPluginInfo.h
+++ b/plugins/ZamTube/DistrhoPluginInfo.h
@@ -20,7 +20,7 @@
 
 #define DISTRHO_PLUGIN_NAME "ZamTube"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_SYNTH      0
 
 #define DISTRHO_PLUGIN_NUM_INPUTS    1
diff --git a/plugins/ZamTube/Makefile b/plugins/ZamTube/Makefile
index d302396..01a4e07 100644
--- a/plugins/ZamTube/Makefile
+++ b/plugins/ZamTube/Makefile
@@ -21,6 +21,11 @@ OBJS_UI  = \
 	ZamTubeUI.cpp.o
 
 # --------------------------------------------------------------
+# No custom UI for now
+
+TARGET_NOUI = true
+
+# --------------------------------------------------------------
 # Do some magic
 
 include ../Makefile.mk