From 4f6cc71bb73043f79e1517eadc724891d9a73656 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 28 Dec 2022 20:01:01 +0000 Subject: [PATCH] Adjust custom build dir to be compatible with latest changes Signed-off-by: falkTX --- Makefile.plugins.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index c1a9f8a5..f146eb63 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -27,24 +27,24 @@ include $(DPF_PATH)/Makefile.base.mk # --------------------------------------------------------------------------------------------------------------------- # Basic setup -ifeq ($(DPF_TARGET_DIR),) -TARGET_DIR = $(BASE_PATH)/bin -else -TARGET_DIR = $(DPF_TARGET_DIR) -endif - ifeq ($(MODGUI_BUILD),true) BUILD_DIR_SUFFIX = -modgui endif -ifeq ($(DPF_BUILD_DIR),) -BUILD_DIR = $(BASE_PATH)/build$(BUILD_DIR_SUFFIX)/$(NAME) -DGL_BUILD_DIR = $(DPF_PATH)/build$(BUILD_DIR_SUFFIX) +ifneq ($(DPF_BUILD_DIR),) +BUILD_DIR = $(DPF_BUILD_DIR)$(BUILD_DIR_SUFFIX) else -BUILD_DIR = $(DPF_BUILD_DIR) -DGL_BUILD_DIR = $(DPF_BUILD_DIR) +BUILD_DIR = $(BASE_PATH)/build$(BUILD_DIR_SUFFIX)/$(NAME) endif +ifneq ($(DPF_TARGET_DIR),) +TARGET_DIR = $(DPF_TARGET_DIR) +else +TARGET_DIR = $(BASE_PATH)/bin +endif + +DGL_BUILD_DIR = $(DPF_PATH)/build$(BUILD_DIR_SUFFIX) + BUILD_C_FLAGS += -I. BUILD_CXX_FLAGS += -I. -I$(DPF_PATH)/distrho -I$(DPF_PATH)/dgl