From 506549a2de7caa500a02d413d01cd056cb60a518 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 9 Jul 2023 17:10:04 +0200 Subject: [PATCH] Cleanup macro usage for plugin builds Signed-off-by: falkTX --- source/backend/engine/CarlaEngine.cpp | 2 +- source/backend/engine/CarlaEngineNative.cpp | 2 +- source/backend/engine/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index da16852dd..2e875960c 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -319,7 +319,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName) return newJack(); #endif -#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_OS_WASM) || defined(STATIC_PLUGIN_TARGET)) +#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_OS_WASM) || defined(CARLA_PLUGIN_BUILD) || defined(STATIC_PLUGIN_TARGET)) if (std::strcmp(driverName, "Dummy") == 0) return newDummy(); #endif diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp index e1c8f3f80..86b9dd27d 100644 --- a/source/backend/engine/CarlaEngineNative.cpp +++ b/source/backend/engine/CarlaEngineNative.cpp @@ -3108,7 +3108,7 @@ CARLA_BACKEND_START_NAMESPACE namespace EngineInit { -#ifndef HAVE_JACK +#ifdef HAVE_JACK CarlaEngine* newJack() { return nullptr; } #endif diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile index 5763f221d..e45b6c900 100644 --- a/source/backend/engine/Makefile +++ b/source/backend/engine/Makefile @@ -117,12 +117,12 @@ ifeq ($(MACOS),true) $(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp -@mkdir -p $(OBJDIR) @echo "Compiling CarlaEngineNative.cpp (plugin)" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -UHAVE_JACK -ObjC++ -c -o $@ + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -ObjC++ -c -o $@ else $(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp -@mkdir -p $(OBJDIR) @echo "Compiling CarlaEngineNative.cpp (plugin)" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -UHAVE_JACK -c -o $@ + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -c -o $@ endif ifeq ($(JACKBRIDGE_DIRECT),true)