From bb049f7e549c54266c0ae9b91d9784821dba55bb Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Apr 2023 21:06:19 +0200 Subject: [PATCH] Set custom DISTRHO and DGL namespace Signed-off-by: falkTX --- Makefile | 16 ++++++++++++---- plugins/Common/Makefile.mk | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fcae14a..7253a4b 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ endif CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Ildaeil \ CAN_GENERATE_LV2_TTL=false \ CUSTOM_DPF_PATH=$(CURDIR)/dpf \ + DGL_NAMESPACE=IldaeilDGL \ STATIC_PLUGIN_TARGET=true \ USING_CUSTOM_DPF=true \ HAVE_FFMPEG=false \ @@ -67,6 +68,13 @@ endif endif # CARLA_EXTRA_TARGETS endif # USE_SYSTEM_CARLA_BINS +# -------------------------------------------------------------- +# DGL config + +DGL_EXTRA_ARGS = \ + DISTRHO_NAMESPACE=IldaeilDISTRHO \ + DGL_NAMESPACE=IldaeilDGL + # --------------------------------------------------------------------------------------------------------------------- # DPF bundled plugins @@ -105,10 +113,10 @@ carla: dgl $(MAKE) $(CARLA_EXTRA_ARGS) -C carla $(CARLA_TARGETS) extra-bins: - $(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_FX_ARGS) carlabins -C plugins/FX + $(MAKE) $(CARLA_EXTRA_ARGS) $(DGL_EXTRA_ARGS) $(ILDAEIL_FX_ARGS) carlabins -C plugins/FX ifneq ($(WASM),true) - $(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_MIDI_ARGS) carlabins -C plugins/MIDI - $(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_SYNTH_ARGS) carlabins -C plugins/Synth + $(MAKE) $(CARLA_EXTRA_ARGS) $(DGL_EXTRA_ARGS) $(ILDAEIL_MIDI_ARGS) carlabins -C plugins/MIDI + $(MAKE) $(CARLA_EXTRA_ARGS) $(DGL_EXTRA_ARGS) $(ILDAEIL_SYNTH_ARGS) carlabins -C plugins/Synth endif extra-posix32: @@ -127,7 +135,7 @@ extra-wine64: $(MAKE) $(CARLA_EXTRA_ARGS) -C carla wine64 dgl: - $(MAKE) -C dpf/dgl opengl + $(MAKE) $(DGL_EXTRA_ARGS) -C dpf/dgl opengl plugins: carla dgl $(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_FX_ARGS) all -C plugins/FX diff --git a/plugins/Common/Makefile.mk b/plugins/Common/Makefile.mk index d9c59aa..6677123 100644 --- a/plugins/Common/Makefile.mk +++ b/plugins/Common/Makefile.mk @@ -10,6 +10,10 @@ ifneq ($(CARLA_BACKEND_NAMESPACE),Ildaeil) $(error wrong build setup) endif +ifneq ($(DGL_NAMESPACE),IldaeilDGL) +$(error wrong build setup) +endif + ifneq ($(STATIC_PLUGIN_TARGET),true) $(error wrong build setup) endif