Signed-off-by: falkTX <falktx@falktx.com>tags/v2.1-rc1
| @@ -445,10 +445,12 @@ ifeq ($(HAVE_JACK),true) | |||||
| $(DESTDIR)$(JACK_LIBDIR)/carla.so | $(DESTDIR)$(JACK_LIBDIR)/carla.so | ||||
| endif | endif | ||||
| ifneq ($(JACKBRIDGE_DIRECT),true) | |||||
| # Install custom libjack | # Install custom libjack | ||||
| install -m 755 \ | install -m 755 \ | ||||
| bin/jack/libjack.so.0 \ | bin/jack/libjack.so.0 \ | ||||
| $(DESTDIR)$(LIBDIR)/carla/jack | $(DESTDIR)$(LIBDIR)/carla/jack | ||||
| endif | |||||
| endif | endif | ||||
| # Install pkg-config files | # Install pkg-config files | ||||
| @@ -1,6 +1,6 @@ | |||||
| /* | /* | ||||
| * JackBridge | * JackBridge | ||||
| * Copyright (C) 2013-2015 Filipe Coelho <falktx@falktx.com> | |||||
| * Copyright (C) 2013-2019 Filipe Coelho <falktx@falktx.com> | |||||
| * | * | ||||
| * Permission to use, copy, modify, and/or distribute this software for any purpose with | * Permission to use, copy, modify, and/or distribute this software for any purpose with | ||||
| * or without fee is hereby granted, provided that the above copyright notice and this | * or without fee is hereby granted, provided that the above copyright notice and this | ||||
| @@ -43,6 +43,7 @@ | |||||
| # include <jack/transport.h> | # include <jack/transport.h> | ||||
| # include <jack/session.h> | # include <jack/session.h> | ||||
| # include <jack/metadata.h> | # include <jack/metadata.h> | ||||
| # include <jack/uuid.h> | |||||
| #else | #else | ||||
| #include <cstddef> | #include <cstddef> | ||||
| @@ -17,6 +17,11 @@ WINE_32BIT_FLAGS = $(32BIT_FLAGS) | |||||
| WINE_64BIT_FLAGS = $(64BIT_FLAGS) | WINE_64BIT_FLAGS = $(64BIT_FLAGS) | ||||
| WINE_LINK_FLAGS = $(LINK_FLAGS) $(LIBDL_LIBS) -lpthread -lstdc++ | WINE_LINK_FLAGS = $(LINK_FLAGS) $(LIBDL_LIBS) -lpthread -lstdc++ | ||||
| ifeq ($(JACKBRIDGE_DIRECT),true) | |||||
| BUILD_CXX_FLAGS += $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags jack) -DJACKBRIDGE_DIRECT | |||||
| LINK_FLAGS += $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs jack) | |||||
| endif | |||||
| ifneq ($(MACOS),true) | ifneq ($(MACOS),true) | ||||
| WINE_32BIT_FLAGS += -I/usr/include/wine/wine/windows | WINE_32BIT_FLAGS += -I/usr/include/wine/wine/windows | ||||
| WINE_32BIT_FLAGS += -L/usr/lib32/wine | WINE_32BIT_FLAGS += -L/usr/lib32/wine | ||||
| @@ -28,6 +28,12 @@ LINK_FLAGS += -lpthread -lrt | |||||
| # --------------------------------------------------------------------------------------------------------------------- | # --------------------------------------------------------------------------------------------------------------------- | ||||
| ifeq ($(LINUX),true) | ifeq ($(LINUX),true) | ||||
| ifneq ($(JACKBRIDGE_DIRECT),true) | |||||
| CAN_BUILD_LIBJACK=true | |||||
| endif | |||||
| endif | |||||
| ifeq ($(CAN_BUILD_LIBJACK),true) | |||||
| OBJS = \ | OBJS = \ | ||||
| $(OBJDIR)/libjack.cpp.o \ | $(OBJDIR)/libjack.cpp.o \ | ||||
| $(OBJDIR)/libjack_base.cpp.o \ | $(OBJDIR)/libjack_base.cpp.o \ | ||||