LADI
/
carla
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only build and install jack internal client with JACKBRIDGE_DIRECT 

Signed-off-by: falkTX <falktx@gmail.com>
This commit is contained in:
falkTX 2019-09-02 10:48:05 +01:00
parent 8e37bc8245
commit 062c43e4c0
No known key found for this signature in database
GPG Key ID: 2D3445A829213837
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -394,9 +394,11 @@ endif
install -d $(DESTDIR)$(INCLUDEDIR)/carla/includes
ifeq ($(LINUX),true)
ifeq ($(HAVE_JACK),true)
ifeq ($(JACKBRIDGE_DIRECT),true)
install -d $(DESTDIR)$(JACK_LIBDIR)
endif
endif
endif
ifeq ($(HAVE_PYQT),true)
# Create directories (gui)
@ -437,11 +439,13 @@ endif
ifeq ($(LINUX),true)
ifeq ($(HAVE_JACK),true)
ifeq ($(JACKBRIDGE_DIRECT),true)
# Install internal jack client
ln -sf \
$(LIBDIR)/carla/libcarla_standalone2.so \
$(DESTDIR)$(JACK_LIBDIR)/carla.so
endif
endif
ifneq ($(JACKBRIDGE_DIRECT),true)
# Install custom libjack

4
source/backend/engine/CarlaEngineJack.cpp
View File

@ -2955,7 +2955,7 @@ CarlaEngine* CarlaEngine::newJack()
CARLA_BACKEND_END_NAMESPACE
#ifndef BUILD_BRIDGE
#if defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)
// -----------------------------------------------------------------------
// internal jack client
@ -3042,4 +3042,4 @@ void jack_finish(void *arg)
}
// -----------------------------------------------------------------------
#endif
#endif // defined(JACKBRIDGE_DIRECT) && !defined(BUILD_BRIDGE)