From fec59af37372d2b84e02b8cae7bda4f2756fedb0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 29 Dec 2022 01:09:02 +0000 Subject: [PATCH] Use -modgui as build suffix dir when building via wasm Signed-off-by: falkTX --- Makefile.plugins.mk | 14 +++++++++++--- dgl/Makefile | 6 +++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index ad8b3481..f146eb63 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -27,10 +27,14 @@ include $(DPF_PATH)/Makefile.base.mk # --------------------------------------------------------------------------------------------------------------------- # Basic setup +ifeq ($(MODGUI_BUILD),true) +BUILD_DIR_SUFFIX = -modgui +endif + ifneq ($(DPF_BUILD_DIR),) -BUILD_DIR = $(DPF_BUILD_DIR) +BUILD_DIR = $(DPF_BUILD_DIR)$(BUILD_DIR_SUFFIX) else -BUILD_DIR = $(BASE_PATH)/build/$(NAME) +BUILD_DIR = $(BASE_PATH)/build$(BUILD_DIR_SUFFIX)/$(NAME) endif ifneq ($(DPF_TARGET_DIR),) @@ -39,7 +43,7 @@ else TARGET_DIR = $(BASE_PATH)/bin endif -DGL_BUILD_DIR = $(DPF_PATH)/build +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 @@ -409,6 +413,10 @@ $(BUILD_DIR)/%.mm.o: %.mm clean: rm -rf $(BUILD_DIR) +ifeq ($(DPF_BUILD_DIR),) + rm -rf $(BASE_PATH)/build-modgui/$(NAME) + rm -rf $(DPF_PATH)/build-modgui +endif rm -rf $(TARGET_DIR)/$(NAME) rm -rf $(TARGET_DIR)/$(NAME)-* rm -rf $(TARGET_DIR)/$(NAME).lv2 diff --git a/dgl/Makefile b/dgl/Makefile index a749fe57..8444c999 100644 --- a/dgl/Makefile +++ b/dgl/Makefile @@ -26,7 +26,11 @@ endif # --------------------------------------------------------------------------------------------------------------------- -BUILD_DIR = ../build +ifeq ($(MODGUI_BUILD),true) +BUILD_DIR_SUFFIX = -modgui +endif + +BUILD_DIR = ../build$(BUILD_DIR_SUFFIX) # ---------------------------------------------------------------------------------------------------------------------