Browse Source

Only build and install jack internal client with JACKBRIDGE_DIRECT

Signed-off-by: falkTX <falktx@gmail.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
062c43e4c0
Signed by: falkTX <falktx@gmail.com> GPG Key ID: 2D3445A829213837
2 changed files with 6 additions and 2 deletions
  1. +4
    -0
      Makefile
  2. +2
    -2
      source/backend/engine/CarlaEngineJack.cpp

+ 4
- 0
Makefile View File

@@ -394,9 +394,11 @@ endif
install -d $(DESTDIR)$(INCLUDEDIR)/carla/includes install -d $(DESTDIR)$(INCLUDEDIR)/carla/includes
ifeq ($(LINUX),true) ifeq ($(LINUX),true)
ifeq ($(HAVE_JACK),true) ifeq ($(HAVE_JACK),true)
ifeq ($(JACKBRIDGE_DIRECT),true)
install -d $(DESTDIR)$(JACK_LIBDIR) install -d $(DESTDIR)$(JACK_LIBDIR)
endif endif
endif endif
endif


ifeq ($(HAVE_PYQT),true) ifeq ($(HAVE_PYQT),true)
# Create directories (gui) # Create directories (gui)
@@ -437,11 +439,13 @@ endif


ifeq ($(LINUX),true) ifeq ($(LINUX),true)
ifeq ($(HAVE_JACK),true) ifeq ($(HAVE_JACK),true)
ifeq ($(JACKBRIDGE_DIRECT),true)
# Install internal jack client # Install internal jack client
ln -sf \ ln -sf \
$(LIBDIR)/carla/libcarla_standalone2.so \ $(LIBDIR)/carla/libcarla_standalone2.so \
$(DESTDIR)$(JACK_LIBDIR)/carla.so $(DESTDIR)$(JACK_LIBDIR)/carla.so
endif endif
endif


ifneq ($(JACKBRIDGE_DIRECT),true) ifneq ($(JACKBRIDGE_DIRECT),true)
# Install custom libjack # Install custom libjack


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

@@ -2955,7 +2955,7 @@ CarlaEngine* CarlaEngine::newJack()


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


#ifndef BUILD_BRIDGE
#if defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// internal jack client // internal jack client


@@ -3042,4 +3042,4 @@ void jack_finish(void *arg)
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#endif
#endif // defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)

Loading…
Cancel
Save