Browse Source

Allow static plugin builds to have JACK driver

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 1 year ago
parent
commit
6785064d54
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 4 additions and 2 deletions
  1. +2
    -0
      source/backend/engine/CarlaEngineNative.cpp
  2. +2
    -2
      source/backend/engine/Makefile

+ 2
- 0
source/backend/engine/CarlaEngineNative.cpp View File

@@ -3089,7 +3089,9 @@ CARLA_BACKEND_START_NAMESPACE


namespace EngineInit { namespace EngineInit {


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


#ifdef USING_JUCE_AUDIO_DEVICES #ifdef USING_JUCE_AUDIO_DEVICES
CarlaEngine* newJuce(const AudioApi) { return nullptr; } CarlaEngine* newJuce(const AudioApi) { return nullptr; }


+ 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 -ObjC++ -c -o $@
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -UHAVE_JACK -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 -c -o $@
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_BUILD -UHAVE_JACK -c -o $@
endif endif


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


Loading…
Cancel
Save