From f077fa1f6cba3d5bf2712edf8dfcbcba30f85fff Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 12:37:48 -0400
Subject: [PATCH 01/10] Refactor OBJECTS in compile.mk

---
 compile.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compile.mk b/compile.mk
index 22b4899f..85ac74f3 100644
--- a/compile.mk
+++ b/compile.mk
@@ -43,12 +43,12 @@ CXXFLAGS += $(FLAGS)
 
 
 # Derive object files from sources and place them before user-defined objects
-SOURCE_OBJECTS := $(patsubst %, build/%.o, $(SOURCES))
+OBJECTS := $(patsubst %, build/%.o, $(SOURCES)) $(OBJECTS)
 DEPENDENCIES := $(patsubst %, build/%.d, $(SOURCES))
 
 # Final targets
 
-$(TARGET): $(SOURCE_OBJECTS) $(OBJECTS)
+$(TARGET): $(OBJECTS)
 	$(CXX) -o $@ $^ $(LDFLAGS)
 
 -include $(DEPENDENCIES)

From 4d4edf1f28099de355d34f28e6e0ab5d69552954 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 13:28:51 -0400
Subject: [PATCH 02/10] Update changelog

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb6a485..a5ce8b87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,28 @@
-Tip: Use `git checkout v0.4.0` for example to check out any previous version mentioned here.
 
-
-### v0.5.1 (2017-12-19)
+### 0.6.0 (2018.03-29)
+
+- Released [*VCV Bridge*](https://vcvrack.com/manual/Core.html#Bridge) for interfacing Rack with your DAW
+	- VST/AU effect plugins (Mac and 32/64-bit Windows) for using Rack as a send/return on a DAW track
+	- VSTi/AUi and DAW clock transport coming soon in a later Rack 0.6 update
+- New *Module Browser* for adding modules to the rack
+	- Launch by right-clicking on the rack or pressing <enter>
+	- Add "favorite" modules by clicking on the star button
+	- Navigate modules with arrow keys
+- Redesigned [Core](https://vcvrack.com/manual/Core.html) modules
+	- Access to audio channels beyond the first 8 inputs/outputs
+	- Improved AUDIO stability
+	- Added retrigger output to MIDI-1
+	- Merged MIDI clock module with MIDI-1
+	- Fixed MIDI-4 sustain pedal in polyphonic modes
+- Improved sample rate conversion performance, disable entirely when not needed
+- Patch cable colors are saved to patch files
+- Added highlighting for active patch cables when hovering mouse over port
+- Added shadows to knobs and ports
+- Added File > "Disconnect cables"
+- Released [Rack SDK](https://github.com/VCVRack/Rack/issues/258#issuecomment-376293898) for compiling plugins without compiling Rack
+
+
+### 0.5.1 (2017-12-19)
 
 - Added Plugin Manager support
 - Fixed metadata panel in the Add Module window
@@ -10,7 +31,7 @@ Tip: Use `git checkout v0.4.0` for example to check out any previous version men
 	- Added Sequential Switch 1 & 2
 
 
-### v0.5.0 (2017-11-21)
+### 0.5.0 (2017-11-21)
 
 - Added zoom scaling from 25% to 200%
 - Automatically scroll when dragging cables to the edge of the screen
@@ -35,7 +56,7 @@ Tip: Use `git checkout v0.4.0` for example to check out any previous version men
 	- Changed LED functions in ADSR
 
 
-### v0.4.0 (2017-10-13)
+### 0.4.0 (2017-10-13)
 
 - Cables can now stack on output ports
 - Added sub-menus for each plugin, includes optional plugin metadata like URLs
@@ -58,7 +79,7 @@ Tip: Use `git checkout v0.4.0` for example to check out any previous version men
 	- Added Keyframer/Mixer
 
 
-### v0.3.2 (2017-09-25)
+### 0.3.2 (2017-09-25)
 
 - Added key commands
 - Fixed "invisible knobs/ports" rendering bug for ~2010 Macs
@@ -72,7 +93,7 @@ Tip: Use `git checkout v0.4.0` for example to check out any previous version men
 	- Reverted SEQ3 to continuous gates
 
 
-### v0.3.1 (2017-09-13)
+### 0.3.1 (2017-09-13)
 
 - Fixed Windows open dialog current working directory graphics problem
 - Ctrl/Cmd-C/V to copy/paste from text and password fields
@@ -83,6 +104,6 @@ Tip: Use `git checkout v0.4.0` for example to check out any previous version men
 - tweaks to Fundamental and Audible Instruments plugins
 
 
-### v0.3.0 (2017-09-10)
+### 0.3.0 (2017-09-10)
 
 - Knobcon public Beta release

From 08276345df2c6d5971cc942c5e9cd0eb60ea9fac Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 14:39:14 -0400
Subject: [PATCH 03/10] Update CHANGELOG, fix strip flags in dist

---
 CHANGELOG.md | 2 +-
 Makefile     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5ce8b87..0c50c238 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 - Released [*VCV Bridge*](https://vcvrack.com/manual/Core.html#Bridge) for interfacing Rack with your DAW
 	- VST/AU effect plugins (Mac and 32/64-bit Windows) for using Rack as a send/return on a DAW track
-	- VSTi/AUi and DAW clock transport coming soon in a later Rack 0.6 update
+	- VSTi/AU instrument, MIDI, and DAW clock transport coming soon in a later Rack 0.6.* update
 - New *Module Browser* for adding modules to the rack
 	- Launch by right-clicking on the rack or pressing <enter>
 	- Add "favorite" modules by clicking on the star button
diff --git a/Makefile b/Makefile
index 2b92336a..f561b984 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ ifeq ($(ARCH), win)
 	cp Bridge/vst/dist/VCV-Bridge-32.dll dist/Rack/Bridge/
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) dist/Rack/
-	strip dist/Rack/$(TARGET)
+	strip -s dist/Rack/$(TARGET)
 	cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
 	cp /mingw64/bin/zlib1.dll dist/Rack/
 	cp /mingw64/bin/libstdc++-6.dll dist/Rack/
@@ -182,7 +182,7 @@ ifeq ($(ARCH), lin)
 	mkdir -p dist/Rack
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) Rack.sh dist/Rack/
-	strip dist/Rack/$(TARGET)
+	strip -s dist/Rack/$(TARGET)
 	cp dep/lib/libspeexdsp.so dist/Rack/
 	cp dep/lib/libjansson.so.4 dist/Rack/
 	cp dep/lib/libGLEW.so.2.1 dist/Rack/

From 1632614df4f15326a9a455e978a63cbe768d9cbc Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 15:15:55 -0400
Subject: [PATCH 04/10] Update CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c50c238..b7d639f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@
 
 - Released [*VCV Bridge*](https://vcvrack.com/manual/Core.html#Bridge) for interfacing Rack with your DAW
 	- VST/AU effect plugins (Mac and 32/64-bit Windows) for using Rack as a send/return on a DAW track
-	- VSTi/AU instrument, MIDI, and DAW clock transport coming soon in a later Rack 0.6.* update
+	- (VSTi/AU instrument, MIDI, and DAW clock transport coming soon in a later Rack 0.6.* update)
+- Updated [*Plugin Manager*](https://vcvrack.com/plugins.html) to handle open-source plugins
+	- Potentially all plugins can be added with help from the [VCV Community](https://github.com/VCVRack/community/issues/248)
 - New *Module Browser* for adding modules to the rack
 	- Launch by right-clicking on the rack or pressing <enter>
 	- Add "favorite" modules by clicking on the star button

From 53113508405cbb2ac33423d2ead9a3b46aa22933 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 15:42:10 -0400
Subject: [PATCH 05/10] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7d639f2..9348c5da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 - Released [*VCV Bridge*](https://vcvrack.com/manual/Core.html#Bridge) for interfacing Rack with your DAW
 	- VST/AU effect plugins (Mac and 32/64-bit Windows) for using Rack as a send/return on a DAW track
-	- (VSTi/AU instrument, MIDI, and DAW clock transport coming soon in a later Rack 0.6.* update)
+	- Enables future VSTi/AU instrument plugins with MIDI and DAW clock transport to be added in a later Rack 0.6.* update
 - Updated [*Plugin Manager*](https://vcvrack.com/plugins.html) to handle open-source plugins
 	- Potentially all plugins can be added with help from the [VCV Community](https://github.com/VCVRack/community/issues/248)
 - New *Module Browser* for adding modules to the rack

From 6ef9a26b3f485cedb6ad94a596cf95423f147806 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 29 Mar 2018 17:08:07 -0400
Subject: [PATCH 06/10] Update CHANGELOG

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9348c5da..4c55e07b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
-### 0.6.0 (2018.03-29)
+### 0.6.0 (2018-03-29)
 
 - Released [*VCV Bridge*](https://vcvrack.com/manual/Core.html#Bridge) for interfacing Rack with your DAW
 	- VST/AU effect plugins (Mac and 32/64-bit Windows) for using Rack as a send/return on a DAW track
@@ -9,14 +9,14 @@
 - New *Module Browser* for adding modules to the rack
 	- Launch by right-clicking on the rack or pressing <enter>
 	- Add "favorite" modules by clicking on the star button
-	- Navigate modules with arrow keys
+	- Navigate modules with arrow keys or mouse
 - Redesigned [Core](https://vcvrack.com/manual/Core.html) modules
 	- Access to audio channels beyond the first 8 inputs/outputs
 	- Improved AUDIO stability
 	- Added retrigger output to MIDI-1
 	- Merged MIDI clock module with MIDI-1
 	- Fixed MIDI-4 sustain pedal in polyphonic modes
-- Improved sample rate conversion performance, disable entirely when not needed
+- Improved sample rate conversion performance, is disabled entirely when not needed
 - Patch cable colors are saved to patch files
 - Added highlighting for active patch cables when hovering mouse over port
 - Added shadows to knobs and ports

From 0a03faf61cb1768ceb476c1d0ddfe5c8f56dd37a Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Mon, 2 Apr 2018 18:07:19 -0400
Subject: [PATCH 07/10] Condense Module Browser module list item, don't persist
 filters

---
 src/app/ModuleBrowser.cpp | 62 ++++++++++++---------------------------
 1 file changed, 18 insertions(+), 44 deletions(-)

diff --git a/src/app/ModuleBrowser.cpp b/src/app/ModuleBrowser.cpp
index f17c4c26..eda9f5b7 100644
--- a/src/app/ModuleBrowser.cpp
+++ b/src/app/ModuleBrowser.cpp
@@ -100,66 +100,39 @@ struct BrowserListItem : OpaqueWidget {
 
 struct ModelItem : BrowserListItem {
 	Model *model;
-	Label *authorLabel = NULL;
-
-	ModelItem() {
-		box.size.y = 2*BND_WIDGET_HEIGHT + 3*itemMargin;
-	}
+	Label *pluginLabel = NULL;
 
 	void setModel(Model *model) {
 		clearChildren();
 		assert(model);
 		this->model = model;
 
-		Label *nameLabel = Widget::create<Label>(Vec(0, 0 + itemMargin));
-		nameLabel->text = model->name;
-		addChild(nameLabel);
-
-		// Hide author label if filtering by author
-		if (sAuthorFilter.empty()) {
-			authorLabel = Widget::create<Label>(Vec(0, 0 + itemMargin));
-			authorLabel->alignment = Label::RIGHT_ALIGNMENT;
-			authorLabel->text = model->author;
-			authorLabel->color.a = 0.5;
-			addChild(authorLabel);
-		}
-
-		SequentialLayout *layout2 = Widget::create<SequentialLayout>(Vec(7, BND_WIDGET_HEIGHT + itemMargin));
-		layout2->spacing = 0;
-		addChild(layout2);
-
-		FavoriteRadioButton *favoriteButton = new FavoriteRadioButton();
+		FavoriteRadioButton *favoriteButton = Widget::create<FavoriteRadioButton>(Vec(8, itemMargin));
 		favoriteButton->box.size.x = 20;
 		favoriteButton->label = "★";
-		layout2->addChild(favoriteButton);
+		addChild(favoriteButton);
 
+		// Set favorite button initial state
 		auto it = sFavoriteModels.find(model);
 		if (it != sFavoriteModels.end())
 			favoriteButton->setValue(1);
 		favoriteButton->model = model;
 
-		// for (ModelTag tag : model->tags) {
-		// 	Button *tagButton = new Button();
-		// 	tagButton->box.size.x = 120;
-		// 	tagButton->text = gTagNames[tag];
-		// 	layout2->addChild(tagButton);
-		// }
+		Label *nameLabel = Widget::create<Label>(favoriteButton->box.getTopRight());
+		nameLabel->text = model->name;
+		addChild(nameLabel);
 
-		Label *tagsLabel = new Label();
-		tagsLabel->color.a = 0.5;
-		int i = 0;
-		for (ModelTag tag : model->tags) {
-			if (i++ > 0)
-				tagsLabel->text += ", ";
-			tagsLabel->text += gTagNames[tag];
-		}
-		layout2->addChild(tagsLabel);
+		pluginLabel = Widget::create<Label>(Vec(0, itemMargin));
+		pluginLabel->alignment = Label::RIGHT_ALIGNMENT;
+		pluginLabel->text = model->plugin->slug + " " + model->plugin->version;
+		pluginLabel->color.a = 0.5;
+		addChild(pluginLabel);
 	}
 
 	void step() override {
 		BrowserListItem::step();
-		if (authorLabel)
-			authorLabel->box.size.x = box.size.x - BND_SCROLLBAR_WIDTH;
+		if (pluginLabel)
+			pluginLabel->box.size.x = box.size.x - BND_SCROLLBAR_WIDTH;
 	}
 
 	void onAction(EventAction &e) override {
@@ -213,7 +186,7 @@ struct TagItem : BrowserListItem {
 struct ClearFilterItem : BrowserListItem {
 	ClearFilterItem() {
 		Label *label = Widget::create<Label>(Vec(0, 0 + itemMargin));
-		label->text = "Clear filter";
+		label->text = "Back";
 		addChild(label);
 	}
 
@@ -310,7 +283,9 @@ struct ModuleBrowser : OpaqueWidget {
 	std::set<ModelTag> availableTags;
 
 	ModuleBrowser() {
-		box.size.x = 400;
+		box.size.x = 450;
+		sAuthorFilter = "";
+		sTagFilter = NO_TAG;
 
 		// Search
 		searchField	= new SearchModuleField();
@@ -481,7 +456,6 @@ void ClearFilterItem::onAction(EventAction &e) {
 	ModuleBrowser *moduleBrowser = getAncestorOfType<ModuleBrowser>();
 	sAuthorFilter = "";
 	sTagFilter = NO_TAG;
-	moduleBrowser->clearSearch();
 	moduleBrowser->refreshSearch();
 	e.consumed = false;
 }

From 9c8a95c66645a348ea399b53b618851473d918cc Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Mon, 2 Apr 2018 18:08:09 -0400
Subject: [PATCH 08/10] Use generic strip in Makefiles

---
 Makefile  | 7 ++++---
 arch.mk   | 2 +-
 plugin.mk | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f561b984..b098602a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ endif
 
 include arch.mk
 
+STRIP ?= strip
 
 # Sources and build flags
 
@@ -111,7 +112,7 @@ ifeq ($(ARCH), mac)
 
 	mkdir -p $(BUNDLE)/Contents/MacOS
 	cp $(TARGET) $(BUNDLE)/Contents/MacOS/
-	strip -S $(BUNDLE)/Contents/MacOS/$(TARGET)
+	$(STRIP) -S $(BUNDLE)/Contents/MacOS/$(TARGET)
 	cp icon.icns $(BUNDLE)/Contents/Resources/
 
 	otool -L $(BUNDLE)/Contents/MacOS/$(TARGET)
@@ -156,7 +157,7 @@ ifeq ($(ARCH), win)
 	cp Bridge/vst/dist/VCV-Bridge-32.dll dist/Rack/Bridge/
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) dist/Rack/
-	strip -s dist/Rack/$(TARGET)
+	$(STRIP) -s dist/Rack/$(TARGET)
 	cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
 	cp /mingw64/bin/zlib1.dll dist/Rack/
 	cp /mingw64/bin/libstdc++-6.dll dist/Rack/
@@ -182,7 +183,7 @@ ifeq ($(ARCH), lin)
 	mkdir -p dist/Rack
 	cp -R LICENSE* res dist/Rack/
 	cp $(TARGET) Rack.sh dist/Rack/
-	strip -s dist/Rack/$(TARGET)
+	$(STRIP) -s dist/Rack/$(TARGET)
 	cp dep/lib/libspeexdsp.so dist/Rack/
 	cp dep/lib/libjansson.so.4 dist/Rack/
 	cp dep/lib/libGLEW.so.2.1 dist/Rack/
diff --git a/arch.mk b/arch.mk
index c9fb5979..06231e16 100644
--- a/arch.mk
+++ b/arch.mk
@@ -2,7 +2,7 @@
 
 ifndef ARCH
 
-MACHINE = $(shell gcc -dumpmachine)
+MACHINE = $(shell $(CC) -dumpmachine)
 ifneq (, $(findstring linux, $(MACHINE)))
 	# Linux
 	ARCH = lin
diff --git a/plugin.mk b/plugin.mk
index 8ac3f367..3903c799 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -6,6 +6,8 @@ ifndef SLUG
 $(error SLUG is not defined)
 endif
 
+STRIP ?= strip
+
 FLAGS += -DSLUG=$(SLUG)
 FLAGS += -fPIC
 FLAGS += -I$(RACK_DIR)/include -I$(RACK_DIR)/dep/include
@@ -46,9 +48,9 @@ dist: all
 	# Strip and copy plugin binary
 	cp $(TARGET) dist/$(SLUG)/
 ifeq ($(ARCH), mac)
-	strip -S dist/$(SLUG)/$(TARGET)
+	$(STRIP) -S dist/$(SLUG)/$(TARGET)
 else
-	strip -s dist/$(SLUG)/$(TARGET)
+	$(STRIP) -s dist/$(SLUG)/$(TARGET)
 endif
 	# Copy distributables
 	cp -R $(DISTRIBUTABLES) dist/$(SLUG)/

From 849cc14c9cf94a175fdc5f051855f28bf85d678d Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Tue, 3 Apr 2018 17:29:27 -0400
Subject: [PATCH 09/10] Full static build on Linux

---
 Makefile     | 18 +++++-------------
 Rack.sh      |  2 --
 dep/Makefile | 31 ++++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100755 Rack.sh

diff --git a/Makefile b/Makefile
index b098602a..faf7c52e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,11 @@ ifeq ($(ARCH), lin)
 	SOURCES += dep/osdialog/osdialog_gtk2.c
 	CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
 	LDFLAGS += -rdynamic \
-		-lpthread -lGL -ldl \
+		-lpthread -lGL -ldl -lX11 -lasound \
 		$(shell pkg-config --libs gtk+-2.0) \
-		-Ldep/lib -lGLEW -lglfw -ljansson -lspeexdsp -lcurl -lzip -lrtaudio -lrtmidi -lcrypto -lssl
+		-Ldep/lib \
+		-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
+		-Wl,-Bdynamic
 	TARGET := Rack
 endif
 
@@ -182,18 +184,8 @@ endif
 ifeq ($(ARCH), lin)
 	mkdir -p dist/Rack
 	cp -R LICENSE* res dist/Rack/
-	cp $(TARGET) Rack.sh dist/Rack/
+	cp $(TARGET) dist/Rack/
 	$(STRIP) -s dist/Rack/$(TARGET)
-	cp dep/lib/libspeexdsp.so dist/Rack/
-	cp dep/lib/libjansson.so.4 dist/Rack/
-	cp dep/lib/libGLEW.so.2.1 dist/Rack/
-	cp dep/lib/libglfw.so.3 dist/Rack/
-	cp dep/lib/libcurl.so.4 dist/Rack/
-	cp dep/lib/libzip.so.5 dist/Rack/
-	cp dep/lib/librtaudio.so dist/Rack/
-	cp dep/lib/librtmidi.so.4 dist/Rack/
-	cp dep/lib/libssl.so.1.1 dist/Rack/
-	cp dep/lib/libcrypto.so.1.1 dist/Rack/
 	cp plugins/Fundamental/dist/Fundamental-*.zip dist/Rack/Fundamental.zip
 	# Make ZIP
 	cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack
diff --git a/Rack.sh b/Rack.sh
deleted file mode 100755
index b76329e1..00000000
--- a/Rack.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-LD_LIBRARY_PATH=. ./Rack
\ No newline at end of file
diff --git a/dep/Makefile b/dep/Makefile
index 65d3fc23..44996deb 100755
--- a/dep/Makefile
+++ b/dep/Makefile
@@ -7,15 +7,16 @@ RACK_DIR ?= ..
 include $(RACK_DIR)/arch.mk
 
 ifeq ($(ARCH), lin)
-	glew = lib/libGLEW.so
-	glfw = lib/libglfw.so
-	jansson = lib/libjansson.so
-	libspeexdsp = lib/libspeexdsp.so
-	libcurl = lib/libcurl.so
-	libzip = lib/libzip.so
-	rtmidi = lib/librtmidi.so
-	rtaudio = lib/librtaudio.so
-	openssl = lib/libssl.so
+	glew = lib/libGLEW.a
+	glfw = lib/libglfw3.a
+	jansson = lib/libjansson.a
+	libspeexdsp = lib/libspeexdsp.a
+	libcurl = lib/libcurl.a
+	libzip = lib/libzip.a
+	zlib = lib/libz.a
+	rtmidi = lib/librtmidi.a
+	rtaudio = lib/librtaudio.a
+	openssl = lib/libssl.a
 endif
 
 ifeq ($(ARCH), mac)
@@ -62,7 +63,6 @@ $(glew):
 
 $(glfw):
 	cd glfw && $(CMAKE) . \
-		-DBUILD_SHARED_LIBS=ON \
 		-DGLFW_COCOA_CHDIR_RESOURCES=OFF -DGLFW_COCOA_MENUBAR=ON -DGLFW_COCOA_RETINA_FRAMEBUFFER=ON
 	$(MAKE) -C glfw
 	$(MAKE) -C glfw install
@@ -98,13 +98,20 @@ $(libcurl): $(openssl)
 	$(MAKE) -C curl-7.56.0
 	$(MAKE) -C curl-7.56.0 install
 
-$(libzip):
+$(libzip): $(zlib)
 	$(WGET) https://nih.at/libzip/libzip-1.2.0.tar.gz
 	$(UNTAR) libzip-1.2.0.tar.gz
 	cd libzip-1.2.0 && $(CONFIGURE)
 	$(MAKE) -C libzip-1.2.0
 	$(MAKE) -C libzip-1.2.0 install
 
+$(zlib):
+	$(WGET) https://www.zlib.net/zlib-1.2.11.tar.gz
+	$(UNTAR) zlib-1.2.11.tar.gz
+	cd zlib-1.2.11 && $(CONFIGURE)
+	$(MAKE) -C zlib-1.2.11
+	$(MAKE) -C zlib-1.2.11 install
+
 $(rtmidi):
 	$(WGET) https://vcvrack.com/downloads/dep/rtmidi.tgz
 	$(UNTAR) rtmidi.tgz
@@ -136,6 +143,8 @@ $(rtaudio):
 	cd rtaudio/build && $(CMAKE) $(RTAUDIO_FLAGS) ..
 	$(MAKE) -C rtaudio/build
 	$(MAKE) -C rtaudio/build install
+	# For some reason, it doesn't install the static library
+	cp rtaudio/build/librtaudio_static.a lib/librtaudio.a
 
 $(nanovg):
 	cp nanovg/src/*.h include/

From e7641c21f26d507a7800ccae783c80ea4f5dfeb4 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Tue, 3 Apr 2018 17:34:55 -0400
Subject: [PATCH 10/10] Add JACK driver to Linux rtaudio, forcing Linux users
 to have JACK installed

---
 Makefile     | 24 ++++++++++++------------
 dep/Makefile |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index faf7c52e..560602f5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,18 +18,6 @@ STRIP ?= strip
 SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 SOURCES += dep/nanovg/src/nanovg.c
 
-ifeq ($(ARCH), lin)
-	SOURCES += dep/osdialog/osdialog_gtk2.c
-	CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-	LDFLAGS += -rdynamic \
-		-lpthread -lGL -ldl -lX11 -lasound \
-		$(shell pkg-config --libs gtk+-2.0) \
-		-Ldep/lib \
-		-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-		-Wl,-Bdynamic
-	TARGET := Rack
-endif
-
 ifeq ($(ARCH), mac)
 	SOURCES += dep/osdialog/osdialog_mac.m
 	CXXFLAGS += -stdlib=libc++
@@ -51,6 +39,18 @@ ifeq ($(ARCH), win)
 	OBJECTS += Rack.res
 endif
 
+ifeq ($(ARCH), lin)
+	SOURCES += dep/osdialog/osdialog_gtk2.c
+	CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
+	LDFLAGS += -rdynamic \
+		-lpthread -lGL -ldl -lX11 -lasound -ljack \
+		$(shell pkg-config --libs gtk+-2.0) \
+		-Ldep/lib \
+		-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
+		-Wl,-Bdynamic
+	TARGET := Rack
+endif
+
 
 # Convenience targets
 
diff --git a/dep/Makefile b/dep/Makefile
index 44996deb..0822fefb 100755
--- a/dep/Makefile
+++ b/dep/Makefile
@@ -126,7 +126,7 @@ 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
+RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON
 endif
 
 ifdef RTAUDIO_ALL_APIS
@@ -134,7 +134,7 @@ ifeq ($(ARCH),mac)
 RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON
 endif
 ifeq ($(ARCH),lin)
-RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON -DAUDIO_UNIX_JACK=ON
+RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON
 endif
 endif