From b1aded6b834542bd3ac0a8be4349c236c4424b29 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 23 May 2014 02:05:38 +0100
Subject: [PATCH] Update for new API

---
 Makefile              |  4 +--
 dpf                   |  2 +-
 plugins/Makefile.mk   | 79 ++++++++++++++++++++++++++++++++++---------
 plugins/ProM/Makefile |  9 +++++
 4 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 9beaee2..d8f3d64 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ libs:
 	$(MAKE) -C dpf/dgl
 
 plugins: libs
-	$(MAKE) -C plugins/ProM
+	$(MAKE) all -C plugins/ProM
 
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
@@ -29,4 +29,4 @@ clean:
 
 # --------------------------------------------------------------
 
-.PHONY: libs plugins
+.PHONY: plugins
diff --git a/dpf b/dpf
index f187108..304054a 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit f187108634f98b0b7fb944dc9ab03c78ccd533e3
+Subproject commit 304054af33b20ddbcdf0e5c87871010e8fc191dc
diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk
index 1feb1f0..0c1eb29 100644
--- a/plugins/Makefile.mk
+++ b/plugins/Makefile.mk
@@ -16,21 +16,21 @@ TARGET_DIR = ../../bin
 BUILD_C_FLAGS   += -I.
 BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
 
-# --------------------------------------------------------------
-# Enable all possible plugin types
-
-ifeq ($(LINUX),true)
-all: jack lv2 vst
-else
-all: lv2 vst
-endif
-
 # --------------------------------------------------------------
 # Set plugin binary file targets
 
-jack = $(TARGET_DIR)/$(NAME)
-lv2  = $(TARGET_DIR)/$(NAME).lv2/$(NAME).$(EXT)
-vst  = $(TARGET_DIR)/$(NAME)-vst.$(EXT)
+jack       = $(TARGET_DIR)/$(NAME)
+ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa.$(EXT)
+dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi.$(EXT)
+dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui
+lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME).$(EXT)
+lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp.$(EXT)
+lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui.$(EXT)
+vst        = $(TARGET_DIR)/$(NAME)-vst.$(EXT)
+
+ifeq ($(WIN32),true)
+dssi_ui += .exe
+endif
 
 # TODO: MacOS VST bundle
 
@@ -40,6 +40,22 @@ vst  = $(TARGET_DIR)/$(NAME)-vst.$(EXT)
 DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
 DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
 
+# --------------------------------------------------------------
+# Handle plugins without UI
+
+ifeq ($(TARGET_NOUI),true)
+dssi_ui =
+lv2_ui =
+DISTRHO_UI_FILES =
+DGL_LIBS =
+OBJS_UI =
+endif
+
+# --------------------------------------------------------------
+# all needs to be first
+
+all:
+
 # --------------------------------------------------------------
 # Common
 
@@ -51,7 +67,7 @@ DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
 
 clean:
 	rm -f *.o
-	rm -rf $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
+	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
 
 # --------------------------------------------------------------
 # JACK
@@ -62,14 +78,45 @@ $(jack): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs jack libprojectM) -lpthread -DDISTRHO_PLUGIN_TARGET_JACK -o $@
 
+# --------------------------------------------------------------
+# LADSPA
+
+ladspa: $(ladspa_dsp)
+
+$(ladspa_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+	mkdir -p $(shell dirname $@)
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(shell pkg-config --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
+
+# --------------------------------------------------------------
+# DSSI
+
+dssi: $(dssi_dsp) $(dssi_ui)
+
+$(dssi_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+	mkdir -p $(shell dirname $@)
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(shell pkg-confi --cflagsg --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
+
+$(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 libprojectM) -lpthread -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
+
 # --------------------------------------------------------------
 # LV2
 
-lv2: $(lv2)
+lv2_one: $(lv2)
+lv2_sep: $(lv2_dsp) $(lv2_ui)
 
 $(lv2): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+
+$(lv2_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+	mkdir -p $(shell dirname $@)
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(shell pkg-config --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+
+$(lv2_ui): $(OBJS_UI) $(DISTRHO_UI_FILES)
+	mkdir -p $(shell dirname $@)
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
 
 # --------------------------------------------------------------
 # VST
@@ -78,6 +125,6 @@ vst: $(vst)
 
 $(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
 	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
 
 # --------------------------------------------------------------
diff --git a/plugins/ProM/Makefile b/plugins/ProM/Makefile
index 5cd9af5..35b7365 100644
--- a/plugins/ProM/Makefile
+++ b/plugins/ProM/Makefile
@@ -24,3 +24,12 @@ OBJS_UI  = \
 include ../Makefile.mk
 
 # --------------------------------------------------------------
+# Enable all possible plugin types
+
+ifeq ($(LINUX),true)
+all: jack lv2_one vst
+else
+all: lv2_one vst
+endif
+
+# --------------------------------------------------------------