Browse Source

Cleanup macro usage for plugin builds

Signed-off-by: falkTX <falktx@falktx.com>
fix-audiofile-buffering
falkTX 1 year ago
parent
commit
506549a2de
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngine.cpp
  2. +1
    -1
      source/backend/engine/CarlaEngineNative.cpp
  3. +2
    -2
      source/backend/engine/Makefile

+ 1
- 1
source/backend/engine/CarlaEngine.cpp View File

@@ -319,7 +319,7 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
return newJack(); return newJack();
#endif #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) if (std::strcmp(driverName, "Dummy") == 0)
return newDummy(); return newDummy();
#endif #endif


+ 1
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -3108,7 +3108,7 @@ CARLA_BACKEND_START_NAMESPACE


namespace EngineInit { namespace EngineInit {


#ifndef HAVE_JACK
#ifdef HAVE_JACK
CarlaEngine* newJack() { return nullptr; } CarlaEngine* newJack() { return nullptr; }
#endif #endif




+ 2
- 2
source/backend/engine/Makefile View File

@@ -117,12 +117,12 @@ ifeq ($(MACOS),true)
$(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp $(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling CarlaEngineNative.cpp (plugin)" @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 else
$(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp $(OBJDIR)/CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling CarlaEngineNative.cpp (plugin)" @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 endif


ifeq ($(JACKBRIDGE_DIRECT),true) ifeq ($(JACKBRIDGE_DIRECT),true)


Loading…
Cancel
Save