Browse Source

Yet another build fix

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 6 years ago
parent
commit
08cb20301a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 10 additions and 7 deletions
  1. +5
    -3
      source/backend/CarlaEngine.hpp
  2. +5
    -3
      source/backend/engine/CarlaEngine.cpp
  3. +0
    -1
      source/bridges-plugin/Makefile

+ 5
- 3
source/backend/CarlaEngine.hpp View File

@@ -1268,12 +1268,14 @@ public:
// -------------------------------------------------------------------
// Engine initializers

// Dummy
static CarlaEngine* newDummy();

// JACK
static CarlaEngine* newJack();

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// Dummy
static CarlaEngine* newDummy();
#endif

#ifdef BUILD_BRIDGE
// Bridge
static CarlaEngine* newBridge(const char* const audioPoolBaseName,


+ 5
- 3
source/backend/engine/CarlaEngine.cpp View File

@@ -198,12 +198,14 @@ CarlaEngine* CarlaEngine::newDriverByName(const char* const driverName)
CARLA_SAFE_ASSERT_RETURN(driverName != nullptr && driverName[0] != '\0', nullptr);
carla_debug("CarlaEngine::newDriverByName(\"%s\")", driverName);

if (std::strcmp(driverName, "Dummy") == 0)
return newDummy();

if (std::strcmp(driverName, "JACK") == 0)
return newJack();

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (std::strcmp(driverName, "Dummy") == 0)
return newDummy();
#endif

#ifndef BUILD_BRIDGE
# ifdef USING_JUCE
// -------------------------------------------------------------------


+ 0
- 1
source/bridges-plugin/Makefile View File

@@ -200,7 +200,6 @@ OBJS_arch = \
$(OBJDIR)/CarlaEngine.cpp.arch.o \
$(OBJDIR)/CarlaEngineClient.cpp.arch.o \
$(OBJDIR)/CarlaEngineData.cpp.arch.o \
$(OBJDIR)/CarlaEngineDummy.cpp.arch.o \
$(OBJDIR)/CarlaEngineInternal.cpp.arch.o \
$(OBJDIR)/CarlaEnginePorts.cpp.arch.o \
$(OBJDIR)/CarlaEngineThread.cpp.arch.o \


Loading…
Cancel
Save