From f105a6ddc6c96efe302d5eef2a31a445a8b48e64 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 26 Feb 2018 03:15:15 -0500 Subject: [PATCH] Disable JACK by default, use RTAUDIO_ALL_APIS again --- dep/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dep/Makefile b/dep/Makefile index e4865237..18d25e1d 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -139,13 +139,22 @@ $(rtmidi): $(MAKE) -C rtmidi install ifeq ($(ARCH),mac) -RTAUDIO_FLAGS += -DAUDIO_OSX_CORE=ON -DAUDIO_UNIX_JACK=ON +RTAUDIO_FLAGS += -DAUDIO_OSX_CORE=ON endif ifeq ($(ARCH),win) RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON endif ifeq ($(ARCH),lin) -RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_LINUX_PULSE=ON -DAUDIO_LINUX_JACK=ON +RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_LINUX_PULSE=ON +endif + +ifdef RTAUDIO_ALL_APIS +ifeq ($(ARCH),mac) +RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON +endif +ifeq ($(ARCH),lin) +RTAUDIO_FLAGS += -DAUDIO_LINUX_JACK=ON +endif endif $(rtaudio):