From 1260ca840f0b5ecd16751388d6f430de7d684304 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 15 Feb 2022 23:39:00 +0000 Subject: [PATCH] Build carla with a custom namespace --- Makefile | 2 +- carla | 2 +- plugins/Cardinal/src/AudioFile.cpp | 2 +- plugins/Cardinal/src/Carla.cpp | 2 +- plugins/Cardinal/src/Ildaeil.cpp | 4 +--- plugins/Makefile | 1 + 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c56fedb..67f82ee 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ endif # -------------------------------------------------------------- # Carla config -CARLA_EXTRA_ARGS = \ +CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Cardinal \ HAVE_FFMPEG=false \ HAVE_FLUIDSYNTH=false \ HAVE_PROJECTM=false \ diff --git a/carla b/carla index 719246e..1f5e44c 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 719246eb66462986c0702480f2d0cc1bef448eb8 +Subproject commit 1f5e44c4bb4926298e4a9d666436671f2d12e5ff diff --git a/plugins/Cardinal/src/AudioFile.cpp b/plugins/Cardinal/src/AudioFile.cpp index 9a141cd..ed72126 100644 --- a/plugins/Cardinal/src/AudioFile.cpp +++ b/plugins/Cardinal/src/AudioFile.cpp @@ -38,7 +38,7 @@ const NativePluginDescriptor* carla_getNativePluginDescriptor(const std::size_t // -------------------------------------------------------------------------------------------------------------------- -using namespace CarlaBackend; +using namespace CARLA_BACKEND_NAMESPACE; static uint32_t host_get_buffer_size(NativeHostHandle); static double host_get_sample_rate(NativeHostHandle); diff --git a/plugins/Cardinal/src/Carla.cpp b/plugins/Cardinal/src/Carla.cpp index c786c43..cdd3256 100644 --- a/plugins/Cardinal/src/Carla.cpp +++ b/plugins/Cardinal/src/Carla.cpp @@ -39,7 +39,7 @@ json_t *jsonp_stringn_nocheck_own(const char* value, size_t len); // -------------------------------------------------------------------------------------------------------------------- -using namespace CarlaBackend; +using namespace CARLA_BACKEND_NAMESPACE; static uint32_t host_get_buffer_size(NativeHostHandle); static double host_get_sample_rate(NativeHostHandle); diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp index 4fe0d70..b7d1039 100644 --- a/plugins/Cardinal/src/Ildaeil.cpp +++ b/plugins/Cardinal/src/Ildaeil.cpp @@ -77,9 +77,7 @@ namespace ildaeil { // -------------------------------------------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------------------------------------------- - -using namespace CarlaBackend; +using namespace CARLA_BACKEND_NAMESPACE; static uint32_t host_get_buffer_size(NativeHostHandle); static double host_get_sample_rate(NativeHostHandle); diff --git a/plugins/Makefile b/plugins/Makefile index b5c8bd2..b702b62 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1017,6 +1017,7 @@ $(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp -Dstbtt_fontinfo=stbtt_fontinfo_cardinal \ -Dstbrp_node=stbrp_node_cardinal \ -Dstbrp_rect=stbrp_rect_cardinal \ + -DCARLA_BACKEND_NAMESPACE=Cardinal \ -DREAL_BUILD \ -DSTATIC_PLUGIN_TARGET \ -I../carla/source/backend \