From ed17991480087acec5fd8c2532b6e5512b9c90f8 Mon Sep 17 00:00:00 2001 From: Luciano Iam Date: Sun, 4 Jul 2021 12:59:41 +0200 Subject: [PATCH] Simplify custom Makefile paths --- Makefile.plugins.mk | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index c71ac8f8..f3cf6719 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -7,14 +7,12 @@ # NOTE: NAME, FILES_DSP and FILES_UI must have been defined before including this file! -ifeq ($(DPF_CUSTOM_PATH),) +ifeq ($(DPF_PATH),) ifeq (,$(wildcard ../../Makefile.base.mk)) DPF_PATH=../../dpf else DPF_PATH=../.. endif -else -DPF_PATH = $(DPF_CUSTOM_PATH) endif include $(DPF_PATH)/Makefile.base.mk @@ -22,21 +20,8 @@ include $(DPF_PATH)/Makefile.base.mk # --------------------------------------------------------------------------------------------------------------------- # Basic setup -ifeq ($(DPF_CUSTOM_PATH),) -TARGET_DIR = ../../bin -BUILD_DIR = ../../build/$(NAME) -else -ifeq ($(DPF_CUSTOM_TARGET_DIR),) -$(error DPF_CUSTOM_TARGET_DIR is not set) -else -TARGET_DIR = $(DPF_CUSTOM_TARGET_DIR) -endif -ifeq ($(DPF_CUSTOM_BUILD_DIR),) -$(error DPF_CUSTOM_BUILD_DIR is not set) -else -BUILD_DIR = $(DPF_CUSTOM_BUILD_DIR) -endif -endif +TARGET_DIR ?= ../../bin +BUILD_DIR ?= ../../build/$(NAME) BUILD_C_FLAGS += -I. BUILD_CXX_FLAGS += -I. -I$(DPF_PATH)/distrho -I$(DPF_PATH)/dgl