From 2037cf81939923a935ff64024ae1b7ce7f4dcefc Mon Sep 17 00:00:00 2001 From: osch Date: Wed, 9 Jan 2019 22:48:42 +0100 Subject: [PATCH] Allow plugins specific Makefiles to simply set ROOT_DIR for specifying DPF_PATH, TARGET_DIR and BUILD_DIR at once before including Makefile.plugins.mk --- Makefile.plugins.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index 76ddddd2..834c3756 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -6,11 +6,12 @@ # NOTE: NAME, FILES_DSP and FILES_UI must have been defined before including this file! +ROOT_DIR ?= ../.. -ifeq (,$(wildcard ../../Makefile.base.mk)) -DPF_PATH=../../dpf +ifeq (,$(wildcard $(ROOT_DIR)/Makefile.base.mk)) +DPF_PATH ?= $(ROOT_DIR)/dpf else -DPF_PATH=../.. +DPF_PATH ?= $(ROOT_DIR) endif include $(DPF_PATH)/Makefile.base.mk @@ -18,8 +19,8 @@ include $(DPF_PATH)/Makefile.base.mk # --------------------------------------------------------------------------------------------------------------------- # Basic setup -TARGET_DIR = ../../bin -BUILD_DIR = ../../build/$(NAME) +TARGET_DIR ?= $(ROOT_DIR)/bin +BUILD_DIR ?= $(ROOT_DIR)/build/$(NAME) BUILD_C_FLAGS += -I. BUILD_CXX_FLAGS += -I. -I$(DPF_PATH)/distrho -I$(DPF_PATH)/dgl