From acca215e4b4367dd43d4a117c81609ee46bbf5ee Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Wed, 28 Mar 2018 03:53:55 -0400
Subject: [PATCH] Mac build: Fix openssl linking, binary stripping

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

diff --git a/Makefile b/Makefile
index a144a750..2b92336a 100644
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,7 @@ ifeq ($(ARCH), win)
 endif
 
 
+# This target is not intended for public use
 dist: all
 ifndef RELEASE
 	exit 1 # Must enable RELEASE for dist target
@@ -110,7 +111,7 @@ ifeq ($(ARCH), mac)
 
 	mkdir -p $(BUNDLE)/Contents/MacOS
 	cp $(TARGET) $(BUNDLE)/Contents/MacOS/
-	strip $(BUNDLE)/Contents/MacOS/$(TARGET)
+	strip -S $(BUNDLE)/Contents/MacOS/$(TARGET)
 	cp icon.icns $(BUNDLE)/Contents/Resources/
 
 	otool -L $(BUNDLE)/Contents/MacOS/$(TARGET)
@@ -124,6 +125,7 @@ ifeq ($(ARCH), mac)
 	cp dep/lib/librtaudio.dylib $(BUNDLE)/Contents/MacOS/
 	cp dep/lib/librtmidi.4.dylib $(BUNDLE)/Contents/MacOS/
 	cp dep/lib/libcrypto.1.1.dylib $(BUNDLE)/Contents/MacOS/
+	cp dep/lib/libssl.1.1.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/$(TARGET)
 	install_name_tool -change lib/libglfw.3.dylib @executable_path/libglfw.3.dylib $(BUNDLE)/Contents/MacOS/$(TARGET)
@@ -134,12 +136,17 @@ ifeq ($(ARCH), mac)
 	install_name_tool -change librtaudio.dylib @executable_path/librtaudio.dylib $(BUNDLE)/Contents/MacOS/$(TARGET)
 	install_name_tool -change $(PWD)/dep/lib/librtmidi.4.dylib @executable_path/librtmidi.4.dylib $(BUNDLE)/Contents/MacOS/$(TARGET)
 	install_name_tool -change $(PWD)/dep/lib/libcrypto.1.1.dylib @executable_path/libcrypto.1.1.dylib $(BUNDLE)/Contents/MacOS/$(TARGET)
+	install_name_tool -change $(PWD)/dep/lib/libssl.1.1.dylib @executable_path/libssl.1.1.dylib $(BUNDLE)/Contents/MacOS/$(TARGET)
 
 	otool -L $(BUNDLE)/Contents/MacOS/$(TARGET)
 
 	cp plugins/Fundamental/dist/Fundamental-*.zip $(BUNDLE)/Contents/Resources/Fundamental.zip
+	cp -R Bridge/au/dist/VCV-Bridge.component dist/
+	cp -R Bridge/vst/dist/VCV-Bridge.vst dist/
 	# Make DMG image
 	cd dist && ln -s /Applications Applications
+	cd dist && ln -s /Library/Audio/Plug-Ins/Components Components
+	cd dist && ln -s /Library/Audio/Plug-Ins/VST VST
 	cd dist && hdiutil create -srcfolder . -volname Rack -ov -format UDZO Rack-$(VERSION)-$(ARCH).dmg
 endif
 ifeq ($(ARCH), win)
diff --git a/plugin.mk b/plugin.mk
index bd2f53b5..8ac3f367 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -46,7 +46,7 @@ dist: all
 	# Strip and copy plugin binary
 	cp $(TARGET) dist/$(SLUG)/
 ifeq ($(ARCH), mac)
-	strip -x dist/$(SLUG)/$(TARGET)
+	strip -S dist/$(SLUG)/$(TARGET)
 else
 	strip -s dist/$(SLUG)/$(TARGET)
 endif