Update plugins and DPF

Makefile

@@ -4,9 +4,9 @@
 # Created by falkTX
 #
 
-include Makefile.mk
+include dpf/Makefile.base.mk
 
-all: libs plugins gen
+all: dgl plugins gen
 
 # --------------------------------------------------------------
 
@@ -15,12 +15,12 @@ DESTDIR ?=
 
 # --------------------------------------------------------------
 
-libs:
+dgl:
 ifeq ($(HAVE_DGL),true)
 	$(MAKE) -C dpf/dgl
 endif
 
-plugins: libs
+plugins: dgl
 	# glBars (needs OpenGL)
 ifeq ($(HAVE_DGL),true)
 	$(MAKE) all -C plugins/glBars
@@ -58,6 +58,7 @@ endif
 	$(MAKE) all -C plugins/gigaverb
 	$(MAKE) all -C plugins/pitchshift
 
+ifneq ($(CROSS_COMPILING),true)
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
 ifeq ($(MACOS),true)
@@ -66,13 +67,14 @@ endif
 
 dpf/utils/lv2_ttl_generator:
 	$(MAKE) -C dpf/utils/lv2-ttl-generator
+else
+gen:
+endif
 
 # --------------------------------------------------------------
 
 clean:
-ifeq ($(HAVE_DGL),true)
 	$(MAKE) clean -C dpf/dgl
-endif
 	$(MAKE) clean -C dpf/utils/lv2-ttl-generator
 
 	# glBars
@@ -123,22 +125,6 @@ ifeq ($(HAVE_DGL),true)
 endif
 	cp -r bin/*.lv2   $(DESTDIR)$(PREFIX)/lib/lv2/
 
-	# Kars
-	cp -r modguis/Kars.modgui/modgui       $(DESTDIR)$(PREFIX)/lib/lv2/Kars.lv2/
-	cp    modguis/Kars.modgui/manifest.ttl $(DESTDIR)$(PREFIX)/lib/lv2/Kars.lv2/modgui.ttl
-
-	# Mini-Series
-	cp -r modguis/PingPongPan.modgui/modgui       $(DESTDIR)$(PREFIX)/lib/lv2/PingPongPan.lv2/
-	cp    modguis/PingPongPan.modgui/manifest.ttl $(DESTDIR)$(PREFIX)/lib/lv2/PingPongPan.lv2/modgui.ttl
-
-	# MVerb
-	cp -r modguis/MVerb.modgui/modgui       $(DESTDIR)$(PREFIX)/lib/lv2/MVerb.lv2/
-	cp    modguis/MVerb.modgui/manifest.ttl $(DESTDIR)$(PREFIX)/lib/lv2/MVerb.lv2/modgui.ttl
-
-	# Nekobi
-	cp -r modguis/Nekobi.modgui/modgui       $(DESTDIR)$(PREFIX)/lib/lv2/Nekobi.lv2/
-	cp    modguis/Nekobi.modgui/manifest.ttl $(DESTDIR)$(PREFIX)/lib/lv2/Nekobi.lv2/modgui.ttl
-
 # --------------------------------------------------------------
 
 .PHONY: plugins

Makefile.mk

@@ -1,147 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-AR  ?= ar
-CC  ?= gcc
-CXX ?= g++
-
-# --------------------------------------------------------------
-# Fallback to Linux if no other OS defined
-
-ifneq ($(HAIKU),true)
-ifneq ($(MACOS),true)
-ifneq ($(WIN32),true)
-LINUX=true
-endif
-endif
-endif
-
-# --------------------------------------------------------------
-# Set build and link flags
-
-BASE_FLAGS = -Wall -Wextra -pipe
-BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-
-ifneq ($(MACOS_OLD),true)
-# Old MacOS doesn't support this
-BASE_OPTS += -mfpmath=sse
-endif
-
-ifeq ($(MACOS),true)
-# MacOS linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
-else
-# Common linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(RASPPI),true)
-# Raspberry-Pi optimization flags
-BASE_OPTS  = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
-LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(NOOPT),true)
-# No optimization flags
-BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
-endif
-
-ifneq ($(WIN32),true)
-# not needed for Windows
-BASE_FLAGS += -fPIC -DPIC
-endif
-
-ifeq ($(DEBUG),true)
-BASE_FLAGS += -DDEBUG -O0 -g
-LINK_OPTS   =
-else
-BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
-CXXFLAGS   += -fvisibility-inlines-hidden
-endif
-
-BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++11 $(CXXFLAGS) $(CPPFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
-
-ifeq ($(MACOS),true)
-# 'no-undefined' is always enabled
-LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
-endif
-
-ifeq ($(MACOS_OLD),true)
-# No C++11 support
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
-endif
-
-# --------------------------------------------------------------
-# Check for optional & required libs
-
-ifeq ($(LINUX),true)
-HAVE_DGL   = $(shell pkg-config --exists gl x11 && echo true)
-HAVE_JACK  = $(shell pkg-config --exists jack   && echo true)
-HAVE_LIBLO = $(shell pkg-config --exists liblo  && echo true)
-endif
-
-ifeq ($(MACOS),true)
-HAVE_DGL = true
-endif
-
-ifeq ($(WIN32),true)
-HAVE_DGL = true
-endif
-
-HAVE_PROJM = $(shell pkg-config --exists libprojectM && echo true)
-
-# --------------------------------------------------------------
-# Set libs stuff
-
-ifeq ($(HAVE_DGL),true)
-
-ifeq ($(LINUX),true)
-DGL_FLAGS = $(shell pkg-config --cflags gl x11)
-DGL_LIBS  = $(shell pkg-config --libs gl x11)
-endif
-
-ifeq ($(MACOS),true)
-DGL_LIBS  = -framework OpenGL -framework Cocoa
-endif
-
-ifeq ($(WIN32),true)
-DGL_LIBS  = -lopengl32 -lgdi32
-endif
-
-endif # HAVE_DGL
-
-# --------------------------------------------------------------
-# Set app extension
-
-ifeq ($(WIN32),true)
-APP_EXT = .exe
-endif
-
-# --------------------------------------------------------------
-# Set shared lib extension
-
-LIB_EXT = .so
-
-ifeq ($(MACOS),true)
-LIB_EXT = .dylib
-endif
-
-ifeq ($(WIN32),true)
-LIB_EXT = .dll
-endif
-
-# --------------------------------------------------------------
-# Set shared library CLI arg
-
-SHARED = -shared
-
-ifeq ($(MACOS),true)
-SHARED = -dynamiclib
-endif
-
-# --------------------------------------------------------------

README.md

@@ -25,9 +25,6 @@ Screenshots
 glBars<br/>
 ![screenshot](https://raw.githubusercontent.com/DISTRHO/DPF-Plugins/master/plugins/glBars/Screenshot.png "glBars")
 
-Kars<br/>
-![screenshot](https://raw.githubusercontent.com/DISTRHO/DPF-Plugins/master/plugins/Kars/Screenshot.png "Kars")
-
 3 Band EQ<br/>
 ![screenshot](https://raw.githubusercontent.com/DISTRHO/DPF-Plugins/master/plugins/3BandEQ/Screenshot.png "3 Band EQ")
 

bin/README

@@ -1,3 +0,0 @@
-All final plugin builds will be placed in this folder.
-
-There is no "make install" process, simply copy those files to their appropriate place.

dpf/README.md

@@ -1,4 +1,5 @@
 # DPF - DISTRHO Plugin Framework
+[![Build Status](https://travis-ci.org/DISTRHO/DPF.png)](https://travis-ci.org/DISTRHO/DPF)
 
 DPF is designed to make development of new plugins an easy and enjoyable task.<br/>
 It allows developers to create plugins with custom UIs using a simple C++ API.<br/>
@@ -28,8 +29,8 @@ List of plugins made with DPF:<br/>
  - [ZamAudio Suite](https://github.com/zamaudio/zam-plugins)
 
 
-Plugin examples are available [here](https://github.com/DISTRHO/plugin-examples).<br/>
-OpenGL UI examples are available [here](https://github.com/DISTRHO/gl-examples).
+Plugin examples are available in the `example/` folder inside this repo.<br/>
+Extra OpenGL UI examples are available [here](https://github.com/DISTRHO/gl-examples).
 
 
 Online documentation is available at [https://distrho.github.io/DPF/](https://distrho.github.io/DPF/).

dpf/dgl/Makefile

@@ -1,86 +1,86 @@
 #!/usr/bin/make -f
-# Makefile for dgl #
+# Makefile for DGL #
 # ---------------- #
 # Created by falkTX
 #
 
-include Makefile.mk
+include ../Makefile.base.mk
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 BUILD_C_FLAGS   += $(DGL_FLAGS) -I. -Isrc
 BUILD_CXX_FLAGS += $(DGL_FLAGS) -I. -Isrc
 LINK_FLAGS      += $(DGL_LIBS)
 
-ifneq ($(MACOS_OLD),true)
+# ifneq ($(MACOS_OLD),true)
 # needed by sofd right now, fix later
-BUILD_CXX_FLAGS += -Wno-type-limits -fpermissive
-endif
+# BUILD_CXX_FLAGS += -Wno-type-limits -fpermissive
+# endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 OBJS = \
-	src/Application.cpp.o \
-	src/Color.cpp.o \
-	src/Geometry.cpp.o \
-	src/Image.cpp.o \
-	src/ImageWidgets.cpp.o \
-	src/NanoVG.cpp.o \
-	src/Resources.cpp.o \
-	src/Widget.cpp.o
+	../build/dgl/Application.cpp.o \
+	../build/dgl/Color.cpp.o \
+	../build/dgl/Geometry.cpp.o \
+	../build/dgl/Image.cpp.o \
+	../build/dgl/ImageWidgets.cpp.o \
+	../build/dgl/NanoVG.cpp.o \
+	../build/dgl/Resources.cpp.o \
+	../build/dgl/Widget.cpp.o
 
 ifeq ($(MACOS),true)
-OBJS += src/Window.mm.o
+OBJS += ../build/dgl/Window.mm.o
 else
-OBJS += src/Window.cpp.o
+OBJS += ../build/dgl/Window.cpp.o
 endif
 
-TARGET = ../libdgl.a
+TARGET = ../build/libdgl.a
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 all: $(TARGET)
 
-# --------------------------------------------------------------
-
-../libdgl.a: $(OBJS)
-	rm -f $@
-	$(AR) crs $@ $^
-
-../libdgl.dll: $(OBJS)
-	# -Wl,--output-def,$@.def,--out-implib,$@.a
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libdgl.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+# ---------------------------------------------------------------------------------------------------------------------
 
-../libdgl.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+../build/libdgl.a: $(OBJS)
+	-@mkdir -p ../build
+	@echo "Creating libdgl.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
+../build/dgl/%.c.o: src/%.c
+	-@mkdir -p ../build/dgl
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+../build/dgl/%.cpp.o: src/%.cpp
+	-@mkdir -p ../build/dgl
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-src/Window.cpp.o: src/Window.cpp src/pugl/*
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+../build/dgl/Window.cpp.o: src/Window.cpp src/sofd/* src/pugl/*
+	-@mkdir -p ../build/dgl
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-src/Window.mm.o: src/Window.cpp src/pugl/*
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
+../build/dgl/Window.mm.o: src/Window.cpp src/sofd/* src/pugl/*
+	-@mkdir -p ../build/dgl
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 clean:
-	rm -f src/*.d src/*.o ../libdgl.*
+	rm -rf ../build/dgl ../build/libdgl.*
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------

dpf/dgl/Makefile.mk

@@ -1,127 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for dgl #
-# ---------------- #
-# Created by falkTX
-#
-
-AR  ?= ar
-CC  ?= gcc
-CXX ?= g++
-
-# --------------------------------------------------------------
-# Fallback to Linux if no other OS defined
-
-ifneq ($(HAIKU),true)
-ifneq ($(MACOS),true)
-ifneq ($(WIN32),true)
-LINUX=true
-endif
-endif
-endif
-
-# --------------------------------------------------------------
-# Set build and link flags
-
-BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
-BASE_OPTS  = -O2 -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-
-ifeq ($(MACOS),true)
-# MacOS linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
-else
-# Common linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(RASPPI),true)
-# Raspberry-Pi optimization flags
-BASE_OPTS  = -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard
-LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(NOOPT),true)
-# No optimization flags
-BASE_OPTS  = -O2 -fdata-sections -ffunction-sections
-endif
-
-ifneq ($(WIN32),true)
-# not needed for Windows
-BASE_FLAGS += -fPIC -DPIC
-endif
-
-ifeq ($(DEBUG),true)
-BASE_FLAGS += -DDEBUG -O0 -g
-LINK_OPTS   =
-else
-BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
-CXXFLAGS   += -fvisibility-inlines-hidden
-endif
-
-BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++11 $(CXXFLAGS) $(CPPFLAGS)
-
-ifeq ($(MACOS),true)
-# 'no-undefined' is always enabled
-LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
-else
-# Specify 'no-undefined'
-LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
-endif
-
-ifeq ($(MACOS_OLD),true)
-# No C++11 support
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
-endif
-
-# --------------------------------------------------------------
-# Strict test build
-
-ifeq ($(TESTBUILD),true)
-BASE_FLAGS += -Werror -Wcast-qual -Wconversion -Wformat -Wformat-security -Wredundant-decls -Wshadow -Wstrict-overflow -fstrict-overflow -Wundef -Wwrite-strings
-BASE_FLAGS += -Wpointer-arith -Wabi -Winit-self -Wuninitialized -Wstrict-overflow=5
-# BASE_FLAGS += -Wfloat-equal
-ifeq ($(CC),clang)
-BASE_FLAGS += -Wdocumentation -Wdocumentation-unknown-command
-BASE_FLAGS += -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-exit-time-destructors -Wno-float-equal
-else
-BASE_FLAGS += -Wcast-align -Wunsafe-loop-optimizations
-endif
-ifneq ($(MACOS),true)
-BASE_FLAGS += -Wmissing-declarations -Wsign-conversion
-ifneq ($(CC),clang)
-BASE_FLAGS += -Wlogical-op
-endif
-endif
-CFLAGS     += -Wold-style-definition -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes
-CXXFLAGS   += -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual
-endif
-
-# --------------------------------------------------------------
-# Check for required libs
-
-ifeq ($(LINUX),true)
-ifneq ($(shell pkg-config --exists gl && echo true),true)
-$(error OpenGL missing, cannot continue)
-endif
-ifneq ($(shell pkg-config --exists x11 && echo true),true)
-$(error X11 missing, cannot continue)
-endif
-endif
-
-# --------------------------------------------------------------
-# Set libs stuff
-
-ifeq ($(LINUX),true)
-DGL_FLAGS = $(shell pkg-config --cflags gl x11)
-DGL_LIBS  = $(shell pkg-config --libs gl x11)
-endif
-
-ifeq ($(MACOS),true)
-DGL_LIBS  = -framework OpenGL -framework Cocoa
-endif
-
-ifeq ($(WIN32),true)
-DGL_LIBS  = -lopengl32 -lgdi32
-endif
-
-# --------------------------------------------------------------

dpf/dgl/src/NanoVG.cpp

@@ -863,7 +863,7 @@ float NanoVG::textBounds(float x, float y, const char* string, const char* end,
     if (fContext == nullptr) return 0.0f;
     DISTRHO_SAFE_ASSERT_RETURN(string != nullptr && string[0] != '\0', 0.0f);
 
-    float b[4];
+    float b[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
     const float ret = nvgTextBounds(fContext, x, y, string, end, b);
     bounds = Rectangle<float>(b[0], b[1], b[2] - b[0], b[3] - b[1]);
     return ret;

dpf/dgl/src/Window.cpp

@@ -241,9 +241,20 @@ struct Window::PrivateData {
 
         if (! fUsingEmbed)
         {
-            pid_t pid = getpid();
-            Atom _nwp = XInternAtom(xDisplay, "_NET_WM_PID", True);
+            const pid_t pid = getpid();
+            const Atom _nwp = XInternAtom(xDisplay, "_NET_WM_PID", False);
             XChangeProperty(xDisplay, xWindow, _nwp, XA_CARDINAL, 32, PropModeReplace, (const uchar*)&pid, 1);
+
+            const Atom _wt = XInternAtom(xDisplay, "_NET_WM_WINDOW_TYPE", False);
+
+            // Setting the window to both dialog and normal will produce a decorated floating dialog
+            // Order is important: DIALOG needs to come before NORMAL
+            const Atom _wts[2] = {
+                XInternAtom(xDisplay, "_NET_WM_WINDOW_TYPE_DIALOG", False),
+                XInternAtom(xDisplay, "_NET_WM_WINDOW_TYPE_NORMAL", False)
+            };
+            XChangeProperty(xDisplay, xWindow, _wt, XA_ATOM, 32, PropModeReplace, (const uchar*)&_wts, 2);
+
         }
 #endif
         puglEnterContext(fView);
@@ -1201,6 +1212,9 @@ bool Window::openFileBrowser(const FileBrowserOptions& options)
 # else
     // not implemented
     return false;
+
+    // unused
+    (void)options;
 # endif
 }
 #endif

dpf/dgl/src/nanovg/fontstash.h

@@ -1226,7 +1226,7 @@ float fonsDrawText(FONScontext* stash,
 				   const char* str, const char* end)
 {
 	FONSstate* state = fons__getState(stash);
-	unsigned int codepoint;
+	unsigned int codepoint = 0;
 	unsigned int utf8state = 0;
 	FONSglyph* glyph = NULL;
 	FONSquad q;
@@ -1411,7 +1411,7 @@ float fonsTextBounds(FONScontext* stash,
 					 float* bounds)
 {
 	FONSstate* state = fons__getState(stash);
-	unsigned int codepoint;
+	unsigned int codepoint = 0;
 	unsigned int utf8state = 0;
 	FONSquad q;
 	FONSglyph* glyph = NULL;

dpf/dgl/src/pugl/pugl_win.cpp

@@ -418,7 +418,7 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 void
-puglGrabFocus(PuglView* view)
+puglGrabFocus(PuglView* /*view*/)
 {
 	// TODO
 }
@@ -474,7 +474,7 @@ puglGetNativeWindow(PuglView* view)
 }
 
 void*
-puglGetContext(PuglView* view)
+puglGetContext(PuglView* /*view*/)
 {
 #ifdef PUGL_HAVE_CAIRO
 	if (view->ctx_type == PUGL_CAIRO) {

dpf/dgl/src/sofd/libsofd.c

@@ -1665,7 +1665,7 @@ static void add_place_raw (Display *dpy, const char *name, const char *path) {
 	strcpy (_placelist[_placecnt].name, name);
 	_placelist[_placecnt].flags = 0;
 
-	int sw;
+	int sw = -1;
 	query_font_geometry (dpy, _fib_gc, name, &sw, NULL, NULL, NULL);
 	if (sw > _fib_place_width) {
 		_fib_place_width = sw;

dpf/distrho/DistrhoPluginMain.cpp

@@ -27,4 +27,6 @@
 # include "src/DistrhoPluginLV2export.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_VST)
 # include "src/DistrhoPluginVST.cpp"
+#else
+# error unsupported format
 #endif

dpf/distrho/DistrhoUIMain.cpp

@@ -26,4 +26,6 @@
 # include "src/DistrhoUILV2.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_VST)
 // nothing
+#else
+# error unsupported format
 #endif

dpf/distrho/src/DistrhoDefines.h

@@ -28,15 +28,15 @@
 /* Check OS */
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 # define DISTRHO_PLUGIN_EXPORT extern "C" __declspec (dllexport)
-# define DISTRHO_OS_WINDOWS    1
+# define DISTRHO_OS_WINDOWS 1
 # define DISTRHO_DLL_EXTENSION "dll"
 #else
 # define DISTRHO_PLUGIN_EXPORT extern "C" __attribute__ ((visibility("default")))
 # if defined(__APPLE__)
-#  define DISTRHO_OS_MAC        1
+#  define DISTRHO_OS_MAC 1
 #  define DISTRHO_DLL_EXTENSION "dylib"
 # elif defined(__HAIKU__)
-#  define DISTRHO_OS_HAIKU      1
+#  define DISTRHO_OS_HAIKU 1
 # elif defined(__linux__) || defined(__linux)
 #  define DISTRHO_OS_LINUX 1
 # endif

dpf/distrho/src/DistrhoPluginCarla.cpp

@@ -1,17 +1,17 @@
 /*
  * DISTRHO Plugin Framework (DPF)
- * Copyright (C) 2012-2016 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * Permission to use, copy, modify, and/or distribute this software for any purpose with
+ * or without fee is hereby granted, provided that the above copyright notice and this
+ * permission notice appear in all copies.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * For a full copy of the license see the LGPL.txt file
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ * TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "DistrhoPluginInternal.hpp"
@@ -30,6 +30,9 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 // Carla UI
 
+#if ! DISTRHO_PLUGIN_WANT_MIDI_OUTPUT
+static const writeMidiFunc writeMidiCallback = nullptr;
+#endif
 #if ! DISTRHO_PLUGIN_WANT_STATE
 static const setStateFunc setStateCallback = nullptr;
 #endif
@@ -104,15 +107,19 @@ protected:
         fHost->ui_parameter_changed(fHost->handle, rindex, value);
     }
 
+#if DISTRHO_PLUGIN_WANT_STATE
     void handleSetState(const char* const key, const char* const value)
     {
         fHost->ui_custom_data_changed(fHost->handle, key, value);
     }
+#endif
 
+#if DISTRHO_PLUGIN_IS_SYNTH
     void handleSendNote(const uint8_t, const uint8_t, const uint8_t)
     {
         // TODO
     }
+#endif
 
     void handleSetSize(const uint width, const uint height)
     {
@@ -175,7 +182,9 @@ class PluginCarla : public NativePluginClass
 {
 public:
     PluginCarla(const NativeHostDescriptor* const host)
-        : NativePluginClass(host)
+        : NativePluginClass(host),
+          fPlugin(this, writeMidiCallback),
+          fScalePointsCache(nullptr)
     {
 #if DISTRHO_PLUGIN_HAS_UI
         fUiPtr = nullptr;
@@ -191,6 +200,12 @@ public:
             fUiPtr = nullptr;
         }
 #endif
+
+        if (fScalePointsCache != nullptr)
+        {
+            delete[] fScalePointsCache;
+            fScalePointsCache = nullptr;
+        }
     }
 
 protected:
@@ -240,6 +255,32 @@ protected:
             param.ranges.max = ranges.max;
         }
 
+        {
+            const ParameterEnumerationValues& enumValues(fPlugin.getParameterEnumValues(index));
+
+            if (const uint32_t scalePointCount = enumValues.count)
+            {
+                NativeParameterScalePoint* const scalePoints = new NativeParameterScalePoint[scalePointCount];
+
+                for (uint32_t i=0; i<scalePointCount; ++i)
+                {
+                    scalePoints[i].label = enumValues.values[i].label.buffer();
+                    scalePoints[i].value = enumValues.values[i].value;
+                }
+
+                param.scalePoints     = scalePoints;
+                param.scalePointCount = scalePointCount;
+
+                if (enumValues.restrictedMode)
+                    param.hints = static_cast<NativeParameterHints>(param.hints|::NATIVE_PARAMETER_USES_SCALEPOINTS);
+            }
+            else if (fScalePointsCache != nullptr)
+            {
+                delete[] fScalePointsCache;
+                fScalePointsCache = nullptr;
+            }
+        }
+
         return &param;
     }
 
@@ -440,6 +481,7 @@ protected:
 
 private:
     PluginExporter fPlugin;
+    mutable NativeParameterScalePoint* fScalePointsCache;
 
 #if DISTRHO_PLUGIN_HAS_UI
     // UI
@@ -455,6 +497,20 @@ private:
     }
 #endif
 
+#if DISTRHO_PLUGIN_WANT_MIDI_OUTPUT
+    static bool writeMidiCallback(void* ptr, const MidiEvent& midiEvent)
+    {
+        if (midiEvent.size > 4)
+            return;
+
+        const NativeMidiEvent event = {
+            midiEvent.frame, 0, midiEvent.size, midiEvent.data
+        };
+
+        return ((PluginCarla*)ptr)->fPlugin.writeMidiEvent(midiEvent);
+    }
+#endif
+
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PluginCarla)
 
     // -------------------------------------------------------------------

dpf/distrho/src/DistrhoPluginJack.cpp

@@ -143,6 +143,8 @@ public:
         if (const uint32_t count = fPlugin.getParameterCount())
         {
             fLastOutputValues = new float[count];
+            std::memset(fLastOutputValues, 0, sizeof(float)*count);
+
 #if DISTRHO_PLUGIN_HAS_UI
             fParametersChanged = new bool[count];
             std::memset(fParametersChanged, 0, sizeof(bool)*count);
@@ -150,17 +152,10 @@ public:
 
             for (uint32_t i=0; i < count; ++i)
             {
-                if (fPlugin.isParameterOutput(i))
-                {
-                    fLastOutputValues[i] = fPlugin.getParameterValue(i);
-                }
-                else
-                {
-                    fLastOutputValues[i] = 0.0f;
 #if DISTRHO_PLUGIN_HAS_UI
+                if (! fPlugin.isParameterOutput(i))
                     fUI.parameterChanged(i, fPlugin.getParameterValue(i));
 #endif
-                }
             }
         }
         else

dpf/distrho/src/DistrhoPluginLADSPA+DSSI.cpp

@@ -30,12 +30,12 @@
 # if DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_MIDI_OUTPUT
 #  error Cannot use MIDI with LADSPA
 # endif
-# if DISTRHO_PLUGIN_WANT_STATE
+# if DISTRHO_PLUGIN_WANT_STATE && !defined(DISTRHO_NO_WARNINGS)
 #  warning LADSPA cannot handle states
 # endif
 #endif
 
-#if DISTRHO_PLUGIN_WANT_TIMEPOS
+#if DISTRHO_PLUGIN_WANT_TIMEPOS && !defined(DISTRHO_NO_WARNINGS)
 # warning LADSPA/DSSI does not support TimePos
 #endif
 

dpf/distrho/src/DistrhoPluginVST.cpp

@@ -29,11 +29,6 @@
 # define __cdecl
 #endif
 
-// has some conflicts
-#ifdef noexcept
-# undef noexcept
-#endif
-
 #define VESTIGE_HEADER
 #define VST_FORCE_DEPRECATED 0
 
@@ -410,7 +405,9 @@ public:
 #  ifdef __LP64__
         fUsingNsView = true;
 #  else
-#   warning 32bit VST UIs on OSX only work if the host supports "hasCockosViewAsConfig"
+#   ifndef DISTRHO_NO_WARNINGS
+#    warning 32bit VST UIs on OSX only work if the host supports "hasCockosViewAsConfig"
+#   endif
         fUsingNsView = false;
 #  endif
 # endif // DISTRHO_OS_MAC

dpf/distrho/src/DistrhoUIInternal.hpp

@@ -434,9 +434,9 @@ public:
         return glWindow.handlePluginKeyboard(press, key);
     }
 #else
-    void setWindowSize(const uint width, const uint height, const bool updateUI = false) {}
-    void setWindowTransientWinId(const uintptr_t winId) {}
-    bool setWindowVisible(const bool yesNo) { return true; }
+    void setWindowSize(const uint, const uint, const bool) {}
+    void setWindowTransientWinId(const uintptr_t) {}
+    bool setWindowVisible(const bool) { return true; }
 #endif
 
     // -------------------------------------------------------------------

dpf/utils/png2rgba.py

@@ -155,7 +155,7 @@ if __name__ == '__main__':
         print("Usage: %s <namespace> <artwork-folder>" % sys.argv[0])
         quit()
 
-    namespace = sys.argv[1]
+    namespace = sys.argv[1].replace("-","_")
     artFolder = sys.argv[2]
 
     if not os.path.exists(artFolder):

get-plugins.sh

@@ -24,24 +24,18 @@ cd ..
 rm -rf dpf
 rm -rf modguis
 rm -rf plugins
-mkdir modguis
 mkdir plugins
 
 mv repos/DPF dpf
 rm -rf dpf/.git*
 
 for PLUGIN in ${PLUGINS[@]}; do
-  if [ -d repos/$PLUGIN/modguis ]; then
-    mv repos/$PLUGIN/modguis/* modguis/
-  fi
   for f in $(ls repos/$PLUGIN/plugins/); do
     mv repos/$PLUGIN/plugins/$f plugins/$f
     if [ -d plugins/$f ]; then
       cp repos/$PLUGIN/LICENSE plugins/$f/LICENSE
     fi
   done
-  mv plugins/Makefile.mk plugins/Makefile.$PLUGIN.mk
-  sed -i -e "s/Makefile.mk/Makefile.$PLUGIN.mk/" plugins/*/Makefile
 done
 
 rm -rf repos

plugins/3BandEQ/Makefile

@@ -12,50 +12,39 @@ NAME = 3BandEQ
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPlugin3BandEQ.cpp.o
+FILES_DSP = \
+	DistrhoPlugin3BandEQ.cpp
 
-OBJS_UI  = \
-	DistrhoArtwork3BandEQ.cpp.o \
-	DistrhoUI3BandEQ.cpp.o
+FILES_UI  = \
+	DistrhoArtwork3BandEQ.cpp \
+	DistrhoUI3BandEQ.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.Mini-Series.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp

@@ -17,8 +17,6 @@
 #include "DistrhoPlugin3BandSplitter.hpp"
 #include "DistrhoUI3BandSplitter.hpp"
 
-using DGL::Point;
-
 START_NAMESPACE_DISTRHO
 
 namespace Art = DistrhoArtwork3BandSplitter;

plugins/3BandSplitter/Makefile

@@ -12,50 +12,39 @@ NAME = 3BandSplitter
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPlugin3BandSplitter.cpp.o
+FILES_DSP = \
+	DistrhoPlugin3BandSplitter.cpp
 
-OBJS_UI  = \
-	DistrhoArtwork3BandSplitter.cpp.o \
-	DistrhoUI3BandSplitter.cpp.o
+FILES_UI  = \
+	DistrhoArtwork3BandSplitter.cpp \
+	DistrhoUI3BandSplitter.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.Mini-Series.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/AmplitudeImposer/Makefile

@@ -12,50 +12,39 @@ NAME = AmplitudeImposer
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginAmplitudeImposer.cpp.o
+FILES_DSP = \
+	DistrhoPluginAmplitudeImposer.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkAmplitudeImposer.cpp.o \
-	DistrhoUIAmplitudeImposer.cpp.o
+FILES_UI  = \
+	DistrhoArtworkAmplitudeImposer.cpp \
+	DistrhoUIAmplitudeImposer.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.ndc-Plugs.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/CycleShifter/Makefile

@@ -12,50 +12,39 @@ NAME = CycleShifter
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginCycleShifter.cpp.o
+FILES_DSP = \
+	DistrhoPluginCycleShifter.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkCycleShifter.cpp.o \
-	DistrhoUICycleShifter.cpp.o
+FILES_UI  = \
+	DistrhoArtworkCycleShifter.cpp \
+	DistrhoUICycleShifter.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.ndc-Plugs.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/Kars/DistrhoArtworkKars.hpp

@@ -1,20 +0,0 @@
-/* (Auto-generated binary data file). */
-
-#ifndef BINARY_DISTRHOARTWORKKARS_HPP
-#define BINARY_DISTRHOARTWORKKARS_HPP
-
-namespace DistrhoArtworkKars
-{
-    extern const char* backgroundData;
-    const unsigned int backgroundDataSize = 379260;
-    const unsigned int backgroundWidth    = 301;
-    const unsigned int backgroundHeight   = 315;
-
-    extern const char* switchData;
-    const unsigned int switchDataSize = 61952;
-    const unsigned int switchWidth    = 88;
-    const unsigned int switchHeight   = 176;
-}
-
-#endif // BINARY_DISTRHOARTWORKKARS_HPP
-

plugins/Kars/DistrhoPluginInfo.h

@@ -21,11 +21,10 @@
 #define DISTRHO_PLUGIN_NAME  "Kars"
 #define DISTRHO_PLUGIN_URI   "http://distrho.sf.net/plugins/Kars"
 
-#define DISTRHO_PLUGIN_HAS_UI        1
+#define DISTRHO_PLUGIN_HAS_UI        0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 #define DISTRHO_PLUGIN_IS_SYNTH      1
 #define DISTRHO_PLUGIN_NUM_INPUTS    0
 #define DISTRHO_PLUGIN_NUM_OUTPUTS   1
-#define DISTRHO_PLUGIN_USES_MODGUI   1
 
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

plugins/Kars/DistrhoPluginKars.cpp

@@ -111,7 +111,7 @@ void DistrhoPluginKars::run(const float**, float** outputs, uint32_t frames, con
                     fNotes[note].velocity = velo;
                     break;
                 }
-                // nobreak
+                // fall through
             case 0x80:
                 note = data[1];
                 DISTRHO_SAFE_ASSERT_BREAK(note < 128); // kMaxNotes

plugins/Kars/DistrhoUIKars.cpp

@@ -1,77 +0,0 @@
-/*
- * DISTRHO Kars Plugin, based on karplong by Chris Cannam.
- * Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any purpose with
- * or without fee is hereby granted, provided that the above copyright notice and this
- * permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "DistrhoPluginKars.hpp"
-#include "DistrhoUIKars.hpp"
-
-START_NAMESPACE_DISTRHO
-
-namespace Art = DistrhoArtworkKars;
-
-// -----------------------------------------------------------------------
-
-DistrhoUIKars::DistrhoUIKars()
-    : UI(Art::backgroundWidth, Art::backgroundHeight),
-      fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight)
-{
-    // sustain switch
-    Image switchImageNormal(Art::switchData, Art::switchWidth, Art::switchHeight/2);
-    Image switchImageDown(Art::switchData+(Art::switchWidth*Art::switchHeight/2*4), Art::switchWidth, Art::switchHeight/2);
-    fSwitchSustain = new ImageSwitch(this, switchImageNormal, switchImageDown);
-    fSwitchSustain->setAbsolutePos(Art::backgroundWidth/2-Art::switchWidth/2, Art::backgroundHeight/2-Art::switchHeight/4);
-    fSwitchSustain->setId(DistrhoPluginKars::paramSustain);
-    fSwitchSustain->setCallback(this);
-}
-
-// -----------------------------------------------------------------------
-// DSP Callbacks
-
-void DistrhoUIKars::parameterChanged(uint32_t index, float value)
-{
-    if (index != 0)
-        return;
-
-    fSwitchSustain->setDown(value > 0.5f);
-}
-
-// -----------------------------------------------------------------------
-// Widget Callbacks
-
-void DistrhoUIKars::imageSwitchClicked(ImageSwitch* imageSwitch, bool down)
-{
-    if (imageSwitch != fSwitchSustain)
-        return;
-
-    editParameter(DistrhoPluginKars::paramSustain, true);
-    setParameterValue(DistrhoPluginKars::paramSustain, down ? 1.0f : 0.0f);
-    editParameter(DistrhoPluginKars::paramSustain, false);
-}
-
-void DistrhoUIKars::onDisplay()
-{
-    fImgBackground.draw();
-}
-
-// -----------------------------------------------------------------------
-
-UI* createUI()
-{
-    return new DistrhoUIKars();
-}
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO

plugins/Kars/DistrhoUIKars.hpp

@@ -1,60 +0,0 @@
-/*
- * DISTRHO Kars Plugin, based on karplong by Chris Cannam.
- * Copyright (C) 2015 Filipe Coelho <falktx@falktx.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any purpose with
- * or without fee is hereby granted, provided that the above copyright notice and this
- * permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef DISTRHO_UI_KARS_HPP_INCLUDED
-#define DISTRHO_UI_KARS_HPP_INCLUDED
-
-#include "DistrhoUI.hpp"
-
-#include "ImageWidgets.hpp"
-
-#include "DistrhoArtworkKars.hpp"
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-class DistrhoUIKars : public UI,
-                      public ImageSwitch::Callback
-{
-public:
-    DistrhoUIKars();
-
-protected:
-    // -------------------------------------------------------------------
-    // DSP Callbacks
-
-    void parameterChanged(uint32_t index, float value) override;
-
-    // -------------------------------------------------------------------
-    // Widget Callbacks
-
-    void imageSwitchClicked(ImageSwitch* imageSwitch, bool down) override;
-
-    void onDisplay() override;
-
-private:
-    Image fImgBackground;
-    ScopedPointer<ImageSwitch> fSwitchSustain;
-
-    DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DistrhoUIKars)
-};
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO
-
-#endif // DISTRHO_UI_KARS_HPP_INCLUDED

plugins/Kars/Makefile

@@ -12,47 +12,24 @@ NAME = Kars
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginKars.cpp.o
-
-OBJS_UI  = \
-	DistrhoArtworkKars.cpp.o \
-	DistrhoUIKars.cpp.o
+FILES_DSP = \
+	DistrhoPluginKars.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.Kars.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_DSSI),true)
 TARGETS += dssi_dsp
-ifeq ($(HAVE_DGL),true)
-ifeq ($(HAVE_LIBLO),true)
-TARGETS += dssi_ui
-endif
-endif
-endif
-
-ifeq ($(BUILD_LV2),true)
-ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
-else
-TARGETS += lv2_dsp
-endif
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/MVerb/DistrhoPluginInfo.h

@@ -28,7 +28,6 @@
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
 #define DISTRHO_PLUGIN_NUM_OUTPUTS   2
 #define DISTRHO_PLUGIN_WANT_PROGRAMS 1
-#define DISTRHO_PLUGIN_USES_MODGUI   1
 
 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:ReverbPlugin"
 

plugins/MVerb/Makefile

@@ -12,50 +12,39 @@ NAME = MVerb
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginMVerb.cpp.o
+FILES_DSP = \
+	DistrhoPluginMVerb.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkMVerb.cpp.o \
-	DistrhoUIMVerb.cpp.o
+FILES_UI  = \
+	DistrhoArtworkMVerb.cpp \
+	DistrhoUIMVerb.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.MVerb.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/Makefile.DPF-Max-Gen.mk

@@ -1,164 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_LADSPA = true
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../common -I../common/gen_dsp -I../../dpf/distrho -I../../dpf/dgl -Wno-unused-parameter
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(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) $(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 $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(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) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Makefile.Kars.mk

@@ -1,163 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(jack): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lpthread $(DGL_LIBS) $(shell pkg-config --cflags --libs jack) -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) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(dssi_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -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) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) -lpthread $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(lv2_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-vst: $(vst)
-
-$(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lpthread $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Makefile.MVerb.mk

@@ -1,164 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_LADSPA = true
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o font/*.d font/*.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(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) $(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 $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(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) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Makefile.Mini-Series.mk

@@ -1,164 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_LADSPA = true
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(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) $(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 $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(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) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Makefile.Nekobi.mk

@@ -1,163 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(jack): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lpthread $(DGL_LIBS) $(shell pkg-config --cflags --libs jack) -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) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(dssi_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -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) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) -lpthread $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(lv2_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-vst: $(vst)
-
-$(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lpthread $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Makefile.ProM.mk

@@ -1,95 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-BASE_FLAGS += -DHAVE_DGL
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-lv2  = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-vst  = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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 $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2: $(lv2)
-
-$(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 --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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 --cflags --libs libprojectM) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
--include $(OBJS_UI:%.o=%.d)
-
-# --------------------------------------------------------------

plugins/Makefile.glBars.mk

@@ -1,95 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-BASE_FLAGS += -DHAVE_DGL
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-lv2  = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-vst  = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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) -lpthread -DDISTRHO_PLUGIN_TARGET_JACK -o $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2: $(lv2)
-
-$(lv2): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
--include $(OBJS_UI:%.o=%.d)
-
-# --------------------------------------------------------------

plugins/Makefile.ndc-Plugs.mk

@@ -1,164 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-ifeq ($(OBJS_UI),)
-HAVE_DGL = false
-endif
-
-# --------------------------------------------------------------
-# Set which plugin formats to build
-
-BUILD_JACK   = true
-ifeq ($(LINUX),true)
-BUILD_LADSPA = true
-BUILD_DSSI   = true
-endif
-BUILD_LV2    = true
-BUILD_VST2   = true
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-ifeq ($(HAVE_DGL),true)
-BASE_FLAGS += -DHAVE_DGL
-endif
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-ifeq ($(HAVE_LIBLO),true)
-BASE_FLAGS += -DHAVE_LIBLO
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
-dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
-dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
-lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
-lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
-vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-endif
-
-# --------------------------------------------------------------
-# Handle plugins without UI
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DISTRHO_UI_FILES =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o font/*.d font/*.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(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) -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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
-
-# --------------------------------------------------------------
-# DSSI
-
-dssi:     $(dssi_dsp) $(dssi_ui)
-dssi_dsp: $(dssi_dsp)
-dssi_ui:  $(dssi_ui)
-
-$(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) $(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 $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2_one: $(lv2)
-lv2_dsp: $(lv2_dsp)
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-$(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) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-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) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
-ifeq ($(HAVE_DGL),true)
--include $(OBJS_UI:%.o=%.d)
-endif
-
-# --------------------------------------------------------------

plugins/Nekobi/DistrhoPluginInfo.h

@@ -27,6 +27,5 @@
 #define DISTRHO_PLUGIN_IS_SYNTH      1
 #define DISTRHO_PLUGIN_NUM_INPUTS    0
 #define DISTRHO_PLUGIN_NUM_OUTPUTS   1
-#define DISTRHO_PLUGIN_USES_MODGUI   1
 
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED

plugins/Nekobi/DistrhoUINekobi.hpp

@@ -25,10 +25,10 @@
 #include "DistrhoArtworkNekobi.hpp"
 #include "NekoWidget.hpp"
 
-using DGL::ImageAboutWindow;
-using DGL::ImageButton;
-using DGL::ImageKnob;
-using DGL::ImageSlider;
+using DGL_NAMESPACE::ImageAboutWindow;
+using DGL_NAMESPACE::ImageButton;
+using DGL_NAMESPACE::ImageKnob;
+using DGL_NAMESPACE::ImageSlider;
 
 START_NAMESPACE_DISTRHO
 

plugins/Nekobi/Makefile

@@ -12,47 +12,44 @@ NAME = Nekobi
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginNekobi.cpp.o
+FILES_DSP = \
+	DistrhoPluginNekobi.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkNekobi.cpp.o \
-	DistrhoUINekobi.cpp.o
+FILES_UI  = \
+	DistrhoArtworkNekobi.cpp \
+	DistrhoUINekobi.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.Nekobi.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+LINK_FLAGS += -lpthread
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_DSSI),true)
 TARGETS += dssi_dsp
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi_ui
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
 
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/Nekobi/NekoWidget.hpp

@@ -25,7 +25,7 @@
 
 #include <cstdlib> // rand
 
-using DGL::Image;
+using DGL_NAMESPACE::Image;
 
 // -----------------------------------------------------------------------
 

plugins/PingPongPan/DistrhoPluginInfo.h

@@ -26,7 +26,6 @@
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
 #define DISTRHO_PLUGIN_NUM_OUTPUTS   2
 #define DISTRHO_PLUGIN_WANT_PROGRAMS 1
-#define DISTRHO_PLUGIN_USES_MODGUI   1
 
 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:SpatialPlugin"
 

plugins/PingPongPan/Makefile

@@ -12,50 +12,39 @@ NAME = PingPongPan
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginPingPongPan.cpp.o
+FILES_DSP = \
+	DistrhoPluginPingPongPan.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkPingPongPan.cpp.o \
-	DistrhoUIPingPongPan.cpp.o
+FILES_UI  = \
+	DistrhoArtworkPingPongPan.cpp \
+	DistrhoUIPingPongPan.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.Mini-Series.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/ProM/DistrhoUIProM.cpp

@@ -174,13 +174,13 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev)
     {
         switch (ev.key)
         {
-        case DGL::kCharBackspace:
+        case DGL_NAMESPACE::kCharBackspace:
             pmKey = PROJECTM_K_BACKSPACE;
             break;
-        case DGL::kCharEscape:
+        case DGL_NAMESPACE::kCharEscape:
             pmKey = PROJECTM_K_ESCAPE;
             break;
-        case DGL::kCharDelete:
+        case DGL_NAMESPACE::kCharDelete:
             pmKey = PROJECTM_K_DELETE;
             break;
         }
@@ -189,7 +189,7 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev)
     if (pmKey == PROJECTM_K_NONE)
         return false;
 
-    if (ev.mod & DGL::kModifierControl)
+    if (ev.mod & DGL_NAMESPACE::kModifierControl)
         pmMod = PROJECTM_KMOD_LCTRL;
 
     fPM->key_handler(ev.press ? PROJECTM_KEYUP : PROJECTM_KEYDOWN, pmKey, pmMod);
@@ -207,84 +207,84 @@ bool DistrhoUIProM::onSpecial(const SpecialEvent& ev)
 
     switch (ev.key)
     {
-    case DGL::kKeyF1:
+    case DGL_NAMESPACE::kKeyF1:
         pmKey = PROJECTM_K_F1;
         break;
-    case DGL::kKeyF2:
+    case DGL_NAMESPACE::kKeyF2:
         pmKey = PROJECTM_K_F2;
         break;
-    case DGL::kKeyF3:
+    case DGL_NAMESPACE::kKeyF3:
         pmKey = PROJECTM_K_F3;
         break;
-    case DGL::kKeyF4:
+    case DGL_NAMESPACE::kKeyF4:
         pmKey = PROJECTM_K_F4;
         break;
-    case DGL::kKeyF5:
+    case DGL_NAMESPACE::kKeyF5:
         pmKey = PROJECTM_K_F5;
         break;
-    case DGL::kKeyF6:
+    case DGL_NAMESPACE::kKeyF6:
         pmKey = PROJECTM_K_F6;
         break;
-    case DGL::kKeyF7:
+    case DGL_NAMESPACE::kKeyF7:
         pmKey = PROJECTM_K_F7;
         break;
-    case DGL::kKeyF8:
+    case DGL_NAMESPACE::kKeyF8:
         pmKey = PROJECTM_K_F8;
         break;
-    case DGL::kKeyF9:
+    case DGL_NAMESPACE::kKeyF9:
         pmKey = PROJECTM_K_F9;
         break;
-    case DGL::kKeyF10:
+    case DGL_NAMESPACE::kKeyF10:
         pmKey = PROJECTM_K_F10;
         break;
-    case DGL::kKeyF11:
+    case DGL_NAMESPACE::kKeyF11:
         pmKey = PROJECTM_K_F11;
         break;
-    case DGL::kKeyF12:
+    case DGL_NAMESPACE::kKeyF12:
         pmKey = PROJECTM_K_F12;
         break;
-    case DGL::kKeyLeft:
+    case DGL_NAMESPACE::kKeyLeft:
         pmKey = PROJECTM_K_LEFT;
         break;
-    case DGL::kKeyUp:
+    case DGL_NAMESPACE::kKeyUp:
         pmKey = PROJECTM_K_UP;
         break;
-    case DGL::kKeyRight:
+    case DGL_NAMESPACE::kKeyRight:
         pmKey = PROJECTM_K_RIGHT;
         break;
-    case DGL::kKeyDown:
+    case DGL_NAMESPACE::kKeyDown:
         pmKey = PROJECTM_K_DOWN;
         break;
-    case DGL::kKeyPageUp:
+    case DGL_NAMESPACE::kKeyPageUp:
         pmKey = PROJECTM_K_PAGEUP;
         break;
-    case DGL::kKeyPageDown:
+    case DGL_NAMESPACE::kKeyPageDown:
         pmKey = PROJECTM_K_PAGEDOWN;
         break;
-    case DGL::kKeyHome:
+    case DGL_NAMESPACE::kKeyHome:
         pmKey = PROJECTM_K_HOME;
         break;
-    case DGL::kKeyEnd:
+    case DGL_NAMESPACE::kKeyEnd:
         pmKey = PROJECTM_K_END;
         break;
-    case DGL::kKeyInsert:
+    case DGL_NAMESPACE::kKeyInsert:
         pmKey = PROJECTM_K_INSERT;
         break;
-    case DGL::kKeyShift:
+    case DGL_NAMESPACE::kKeyShift:
         pmKey = PROJECTM_K_LSHIFT;
         break;
-    case DGL::kKeyControl:
+    case DGL_NAMESPACE::kKeyControl:
         pmKey = PROJECTM_K_LCTRL;
         break;
-    case DGL::kKeyAlt:
-    case DGL::kKeySuper:
+    case DGL_NAMESPACE::kKeyAlt:
+    case DGL_NAMESPACE::kKeySuper:
         break;
     }
 
     if (pmKey == PROJECTM_K_NONE)
         return false;
 
-    if (ev.mod & DGL::kModifierControl)
+    if (ev.mod & DGL_NAMESPACE::kModifierControl)
         pmMod = PROJECTM_KMOD_LCTRL;
 
     fPM->key_handler(ev.press ? PROJECTM_KEYUP : PROJECTM_KEYDOWN, pmKey, pmMod);

plugins/ProM/Makefile

@@ -12,33 +12,26 @@ NAME = ProM
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginProM.cpp.o
+FILES_DSP = \
+	DistrhoPluginProM.cpp
 
-OBJS_UI  = \
-	DistrhoUIProM.cpp.o
+FILES_UI  = \
+	DistrhoUIProM.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.ProM.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 TARGETS += lv2
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/SoulForce/Makefile

@@ -12,50 +12,39 @@ NAME = SoulForce
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginSoulForce.cpp.o
+FILES_DSP = \
+	DistrhoPluginSoulForce.cpp
 
-OBJS_UI  = \
-	DistrhoArtworkSoulForce.cpp.o \
-	DistrhoUISoulForce.cpp.o
+FILES_UI  = \
+	DistrhoArtworkSoulForce.cpp \
+	DistrhoUISoulForce.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.ndc-Plugs.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
+TARGETS += vst
 
-ifeq ($(BUILD_DSSI),true)
 ifeq ($(HAVE_DGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
-endif
 
-ifeq ($(BUILD_LV2),true)
 ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp
 endif
-endif
-
-ifeq ($(BUILD_VST2),true)
-TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/bitcrush/Makefile

@@ -12,34 +12,29 @@ NAME = MaBitcrush
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginMaxGen.cpp.o
+FILES_DSP = \
+	DistrhoPluginMaxGen.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.DPF-Max-Gen.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/freeverb/Makefile

@@ -12,34 +12,29 @@ NAME = MaFreeverb
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginMaxGen.cpp.o
+FILES_DSP = \
+	DistrhoPluginMaxGen.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.DPF-Max-Gen.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/gigaverb/Makefile

@@ -12,34 +12,29 @@ NAME = MaGigaverb
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginMaxGen.cpp.o
+FILES_DSP = \
+	DistrhoPluginMaxGen.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.DPF-Max-Gen.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)
 

plugins/glBars/Makefile

@@ -12,16 +12,21 @@ NAME = glBars
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginGLBars.cpp.o
+FILES_DSP = \
+	DistrhoPluginGLBars.cpp
 
-OBJS_UI  = \
-	DistrhoUIGLBars.cpp.o
+FILES_UI  = \
+	DistrhoUIGLBars.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.glBars.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+LINK_FLAGS += -lpthread
 
 # --------------------------------------------------------------
 # Enable all possible plugin types

plugins/pitchshift/Makefile

@@ -12,34 +12,29 @@ NAME = MaPitchshift
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginMaxGen.cpp.o
+FILES_DSP = \
+	DistrhoPluginMaxGen.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.DPF-Max-Gen.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+BUILD_CXX_FLAGS += -I../common -I../common/gen_dsp
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(BUILD_JACK),true)
 ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-endif
 
-ifeq ($(BUILD_LADSPA),true)
 TARGETS += ladspa
-endif
-
-ifeq ($(BUILD_LV2),true)
 TARGETS += lv2_dsp
-endif
-
-ifeq ($(BUILD_VST2),true)
 TARGETS += vst
-endif
 
 all: $(TARGETS)