From ec9f9ccd5d64c24d16560442d97760a58c009c62 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 16 May 2014 01:33:47 +0100 Subject: [PATCH] Update for JACK support --- Makefile.mk | 4 +++- dpf | 2 +- plugins/Makefile.mk | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index 9721a81..eaaa41e 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -47,7 +47,6 @@ LINK_OPTS = else BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden CXXFLAGS += -fvisibility-inlines-hidden -LINK_OPTS += -Wl,--strip-all endif BUILD_C_FLAGS = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS) @@ -64,6 +63,9 @@ endif # Check for required libs ifeq ($(LINUX),true) +ifneq ($(shell pkg-config --exists jack && echo true),true) +$(error JACK missing, cannot continue) +endif ifneq ($(shell pkg-config --exists gl && echo true),true) $(error OpenGL missing, cannot continue) endif diff --git a/dpf b/dpf index 1d00b38..b4ac031 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 1d00b38275356435cd384fd89fa9e65e4d6939c8 +Subproject commit b4ac0311058bd1626d00e83824ec98a23651d873 diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index 6722717..721d76a 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -19,13 +19,18 @@ 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 -lv2 = $(TARGET_DIR)/$(NAME).lv2/$(NAME).$(EXT) -vst = $(TARGET_DIR)/$(NAME)-vst.$(EXT) +jack = $(TARGET_DIR)/$(NAME) +lv2 = $(TARGET_DIR)/$(NAME).lv2/$(NAME).$(EXT) +vst = $(TARGET_DIR)/$(NAME)-vst.$(EXT) # TODO: MacOS VST bundle @@ -48,6 +53,15 @@ clean: rm -f *.o rm -rf $(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 --libs jack libprojectM) -lpthread -DDISTRHO_PLUGIN_TARGET_JACK -o $@ + # -------------------------------------------------------------- # LV2