From f36647e14eba2ef856a14fe9c6bbf946c5aabdce Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 20 Nov 2017 19:24:41 -0500 Subject: [PATCH] Add rtaudio library to dist, remove JACK from Windows/Mac --- Makefile | 2 ++ dep/Makefile | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9037c432..0676cea8 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,7 @@ ifeq ($(ARCH), mac) cp dep/lib/libzip.5.dylib $(BUNDLE)/Contents/MacOS/ cp dep/lib/libportaudio.2.dylib $(BUNDLE)/Contents/MacOS/ cp dep/lib/librtmidi.4.dylib $(BUNDLE)/Contents/MacOS/ + cp dep/lib/librtaudio.6.dylib $(BUNDLE)/Contents/MacOS/ install_name_tool -change /usr/local/lib/libGLEW.2.1.0.dylib @executable_path/libGLEW.2.1.0.dylib $(BUNDLE)/Contents/MacOS/Rack install_name_tool -change lib/libglfw.3.dylib @executable_path/libglfw.3.dylib $(BUNDLE)/Contents/MacOS/Rack @@ -111,6 +112,7 @@ ifeq ($(ARCH), mac) install_name_tool -change $(PWD)/dep/lib/libzip.5.dylib @executable_path/libzip.5.dylib $(BUNDLE)/Contents/MacOS/Rack install_name_tool -change $(PWD)/dep/lib/libportaudio.2.dylib @executable_path/libportaudio.2.dylib $(BUNDLE)/Contents/MacOS/Rack install_name_tool -change $(PWD)/dep/lib/librtmidi.4.dylib @executable_path/librtmidi.4.dylib $(BUNDLE)/Contents/MacOS/Rack + install_name_tool -change $(PWD)/dep/lib/librtaudio.6.dylib @executable_path/librtaudio.6.dylib $(BUNDLE)/Contents/MacOS/Rack otool -L $(BUNDLE)/Contents/MacOS/Rack diff --git a/dep/Makefile b/dep/Makefile index 479e8cc3..52aaa48c 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -58,13 +58,15 @@ endif # Library configuration ifdef RTAUDIO_ALL_APIS ifeq ($(ARCH),mac) - RTAUDIO_FLAGS = --with-core --with-jack + RTAUDIO_FLAGS = --with-core + #--with-jack endif ifeq ($(ARCH),win) RTAUDIO_FLAGS = --with-asio --with-wasapi --with-ds endif ifeq ($(ARCH),lin) - RTAUDIO_FLAGS = --with-alsa --with-pulse --with-jack + RTAUDIO_FLAGS = --with-alsa --with-pulse + #--with-jack endif endif