From e79038812b1bad3fb5b09e5f07c2d7f3c2c6c11c Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 30 Jun 2022 20:03:38 +0100 Subject: [PATCH] Set custom DISTRHO and DGL namespace Closes #271 Signed-off-by: falkTX --- Makefile | 7 +++++-- carla | 2 +- deps/Makefile | 2 ++ dpf | 2 +- jucewrapper/CMakeLists.txt | 6 ++++++ lv2export/Makefile | 2 +- plugins/Makefile | 2 ++ src/Makefile | 2 ++ src/Makefile.cardinal.mk | 2 ++ 9 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 44c8eb8..4c8a970 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ VERSION = 22.06 # -------------------------------------------------------------- # Import base definitions -USE_NANOVG_FBO = true include dpf/Makefile.base.mk # -------------------------------------------------------------- @@ -43,7 +42,9 @@ endif # -------------------------------------------------------------- # Carla config -CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Cardinal \ +CARLA_EXTRA_ARGS = \ + CARLA_BACKEND_NAMESPACE=Cardinal \ + DGL_NAMESPACE=CardinalDGL \ HAVE_FFMPEG=false \ HAVE_FLUIDSYNTH=false \ HAVE_PROJECTM=false \ @@ -58,6 +59,8 @@ endif # DGL config DGL_EXTRA_ARGS = \ + DISTRHO_NAMESPACE=CardinalDISTRHO \ + DGL_NAMESPACE=CardinalDGL \ NVG_DISABLE_SKIPPING_WHITESPACE=true \ NVG_FONT_TEXTURE_FLAGS=NVG_IMAGE_NEAREST \ USE_NANOVG_FBO=true \ diff --git a/carla b/carla index f428af3..770364f 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit f428af3894a5916aee281fa682f4a938f8e67f0b +Subproject commit 770364fd8e684d08aa08f74d88c6d8cb41f77c21 diff --git a/deps/Makefile b/deps/Makefile index 94b15c1..22d3206 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -7,6 +7,8 @@ # -------------------------------------------------------------- # Import base definitions +DISTRHO_NAMESPACE = CardinalDISTRHO +DGL_NAMESPACE = CardinalDGL USE_NANOVG_FBO = true include ../dpf/Makefile.base.mk diff --git a/dpf b/dpf index 38dad9f..194f04a 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 38dad9fdfd75e0887a31abb9bfe7acff88cfd85b +Subproject commit 194f04aee8396c98f320052626603d77a1b1931e diff --git a/jucewrapper/CMakeLists.txt b/jucewrapper/CMakeLists.txt index 1854ac7..15f35d6 100644 --- a/jucewrapper/CMakeLists.txt +++ b/jucewrapper/CMakeLists.txt @@ -143,6 +143,8 @@ target_include_directories(Cardinal target_compile_definitions(Cardinal PUBLIC + DISTRHO_NAMESPACE=CardinalDISTRHO + DGL_NAMESPACE=CardinalDGL JucePlugin_PreferredChannelConfigurations=8,8 JUCE_CHECK_MEMORY_LEAKS=0 JUCE_DISABLE_NATIVE_FILECHOOSERS=1 @@ -234,6 +236,8 @@ target_include_directories(CardinalFX target_compile_definitions(CardinalFX PUBLIC + DISTRHO_NAMESPACE=CardinalDISTRHO + DGL_NAMESPACE=CardinalDGL JucePlugin_PreferredChannelConfigurations=2,2 JUCE_CHECK_MEMORY_LEAKS=0 JUCE_DISABLE_NATIVE_FILECHOOSERS=1 @@ -324,6 +328,8 @@ target_include_directories(CardinalSynth target_compile_definitions(CardinalSynth PUBLIC + DISTRHO_NAMESPACE=CardinalDISTRHO + DGL_NAMESPACE=CardinalDGL JucePlugin_PreferredChannelConfigurations=0,2 JUCE_CHECK_MEMORY_LEAKS=0 JUCE_DISABLE_NATIVE_FILECHOOSERS=1 diff --git a/lv2export/Makefile b/lv2export/Makefile index 0946d45..53ef3a1 100644 --- a/lv2export/Makefile +++ b/lv2export/Makefile @@ -14,7 +14,7 @@ SYSDEPS ?= false # -------------------------------------------------------------- # Import base definitions -USE_NANOVG_FBO = true +DISTRHO_NAMESPACE = CardinalLV2 include ../dpf/Makefile.base.mk # -------------------------------------------------------------- diff --git a/plugins/Makefile b/plugins/Makefile index d46d634..76f002f 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -7,6 +7,8 @@ # -------------------------------------------------------------- # Import base definitions +DISTRHO_NAMESPACE = CardinalDISTRHO +DGL_NAMESPACE = CardinalDGL USE_NANOVG_FBO = true include ../dpf/Makefile.base.mk diff --git a/src/Makefile b/src/Makefile index 2e2bfab..e24110d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,6 +7,8 @@ # -------------------------------------------------------------- # Import base definitions +DISTRHO_NAMESPACE = CardinalDISTRHO +DGL_NAMESPACE = CardinalDGL USE_NANOVG_FBO = true include ../dpf/Makefile.base.mk diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 5a36fd6..ec997a4 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -48,6 +48,8 @@ endif # STATIC_BUILD # -------------------------------------------------------------- # Import base definitions +DISTRHO_NAMESPACE = CardinalDISTRHO +DGL_NAMESPACE = CardinalDGL NVG_DISABLE_SKIPPING_WHITESPACE = true NVG_FONT_TEXTURE_FLAGS = NVG_IMAGE_NEAREST USE_NANOVG_FBO = true