Merge branch 'v0.5' into HEAD

Makefile

@@ -117,6 +117,7 @@ ifeq ($(ARCH), mac)
 	cp dep/lib/libzip.5.dylib $(BUNDLE)/Contents/MacOS/
 	cp dep/lib/librtaudio.dylib $(BUNDLE)/Contents/MacOS/
 	cp dep/lib/librtmidi.4.dylib $(BUNDLE)/Contents/MacOS/
+	cp dep/lib/libssl.1.1.dylib $(BUNDLE)/Contents/MacOS/
 	cp dep/lib/libcrypto.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/Rack
@@ -127,6 +128,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 librtaudio.dylib @executable_path/librtaudio.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/libssl.1.1.dylib @executable_path/libssl.1.1.dylib $(BUNDLE)/Contents/MacOS/Rack
 	install_name_tool -change $(PWD)/dep/lib/libcrypto.1.1.dylib @executable_path/libcrypto.1.1.dylib $(BUNDLE)/Contents/MacOS/Rack
 
 	otool -L $(BUNDLE)/Contents/MacOS/Rack

README.md

@@ -29,7 +29,7 @@ Install [CMake](https://cmake.org/) (for some of Rack's dependencies) and wget,
 Install [MSYS2](http://www.msys2.org/) and launch the mingw64 shell (not the default msys2 shell).
 Install build dependencies with the pacman package manger.
 
-	pacman -S git make tar unzip mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake
+	pacman -S git make tar zip unzip mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake
 
 ### Linux
 

compile.mk

@@ -6,7 +6,14 @@ endif
 FLAGS += -MMD
 FLAGS += -g
 # Optimization
-FLAGS += -O3 -march=nocona -ffast-math -fno-finite-math-only
+FLAGS += -O3
+# Native compile flag will be used unless COMMON=true is passed as a parameter to make
+ifeq ($(COMMON), true)
+	FLAGS += -march=nocona
+else
+	FLAGS += -march=native
+endif
+FLAGS += -ffast-math -fno-finite-math-only
 FLAGS += -Wall -Wextra -Wno-unused-parameter
 ifneq ($(ARCH), mac)
 	CXXFLAGS += -Wsuggest-override

dep/Makefile

@@ -121,6 +121,11 @@ $(openssl):
 	cd openssl-1.1.0g && ./config --prefix="$(LOCAL)"
 	$(MAKE) -C openssl-1.1.0g
 	$(MAKE) -C openssl-1.1.0g install
+ifeq ($(ARCH),mac)
+	otool -L lib/libssl.1.1.dylib
+	install_name_tool -change $(PWD)/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib lib/libssl.1.1.dylib
+	otool -L lib/libssl.1.1.dylib
+endif
 
 $(libcurl): $(openssl)
 	$(WGET) https://github.com/curl/curl/releases/download/curl-7_56_0/curl-7.56.0.tar.gz
@@ -131,6 +136,12 @@ $(libcurl): $(openssl)
 		--without-ca-bundle --with-ca-fallback --with-ssl="$(LOCAL)"
 	$(MAKE) -C curl-7.56.0
 	$(MAKE) -C curl-7.56.0 install
+ifeq ($(ARCH),mac)
+	otool -L lib/libcurl.4.dylib
+	install_name_tool -change $(PWD)/lib/libssl.1.1.dylib @loader_path/libssl.1.1.dylib lib/libcurl.4.dylib
+	install_name_tool -change $(PWD)/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib lib/libcurl.4.dylib
+	otool -L lib/libcurl.4.dylib
+endif
 
 $(libzip):
 	$(WGET) https://nih.at/libzip/libzip-1.2.0.tar.gz