Browse Source

One more build fix

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.0
falkTX 2 years ago
parent
commit
ca15445429
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 5 additions and 3 deletions
  1. +2
    -0
      source/backend/CarlaStandalone.cpp
  2. +1
    -1
      source/backend/engine/CarlaEngineJack.cpp
  3. +2
    -2
      source/bridges-plugin/Makefile

+ 2
- 0
source/backend/CarlaStandalone.cpp View File

@@ -979,11 +979,13 @@ void carla_set_engine_option(CarlaHostHandle handle, EngineOption option, int va
break; break;
#endif #endif


#ifndef BUILD_BRIDGE
case CB::ENGINE_OPTION_DEBUG_CONSOLE_OUTPUT: case CB::ENGINE_OPTION_DEBUG_CONSOLE_OUTPUT:
#ifdef CARLA_CAN_USE_LOG_THREAD #ifdef CARLA_CAN_USE_LOG_THREAD
shandle.logThreadEnabled = (value != 0); shandle.logThreadEnabled = (value != 0);
#endif #endif
break; break;
#endif


case CB::ENGINE_OPTION_CLIENT_NAME_PREFIX: case CB::ENGINE_OPTION_CLIENT_NAME_PREFIX:
if (shandle.engineOptions.clientNamePrefix != nullptr) if (shandle.engineOptions.clientNamePrefix != nullptr)


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

@@ -3503,7 +3503,7 @@ protected:
} }
} }


pData->thread.stopThread(500);
pData->runner.stopRunner();
fClient = nullptr; fClient = nullptr;


#ifdef BUILD_BRIDGE #ifdef BUILD_BRIDGE


+ 2
- 2
source/bridges-plugin/Makefile View File

@@ -205,7 +205,7 @@ OBJS_native = \
$(OBJDIR)/CarlaEngineNative.cpp.o \ $(OBJDIR)/CarlaEngineNative.cpp.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.o \ $(OBJDIR)/CarlaEngineOscSend.cpp.o \
$(OBJDIR)/CarlaEnginePorts.cpp.o \ $(OBJDIR)/CarlaEnginePorts.cpp.o \
$(OBJDIR)/CarlaEngineThread.cpp.o \
$(OBJDIR)/CarlaEngineRunner.cpp.o \
$(OBJDIR)/CarlaEngineJack.cpp.o \ $(OBJDIR)/CarlaEngineJack.cpp.o \
$(OBJDIR)/CarlaEngineBridge.cpp.o \ $(OBJDIR)/CarlaEngineBridge.cpp.o \
$(OBJDIR)/CarlaPlugin.cpp.o \ $(OBJDIR)/CarlaPlugin.cpp.o \
@@ -234,7 +234,7 @@ OBJS_arch = \
$(OBJDIR)/CarlaEngineData.cpp.arch.o \ $(OBJDIR)/CarlaEngineData.cpp.arch.o \
$(OBJDIR)/CarlaEngineInternal.cpp.arch.o \ $(OBJDIR)/CarlaEngineInternal.cpp.arch.o \
$(OBJDIR)/CarlaEnginePorts.cpp.arch.o \ $(OBJDIR)/CarlaEnginePorts.cpp.arch.o \
$(OBJDIR)/CarlaEngineThread.cpp.arch.o \
$(OBJDIR)/CarlaEngineRunner.cpp.arch.o \
$(OBJDIR)/CarlaEngineJack.cpp.arch.o \ $(OBJDIR)/CarlaEngineJack.cpp.arch.o \
$(OBJDIR)/CarlaEngineBridge.cpp.arch.o \ $(OBJDIR)/CarlaEngineBridge.cpp.arch.o \
$(OBJDIR)/CarlaPlugin.cpp.arch.o \ $(OBJDIR)/CarlaPlugin.cpp.arch.o \


Loading…
Cancel
Save