From 41855cbcd029f0e56cf6968de46c91bc407d693d Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 19 Dec 2017 05:49:11 -0500 Subject: [PATCH 1/4] Add openssl to Mac build --- Makefile | 2 ++ dep/Makefile | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index ee75ac3c..3a1cb4b4 100644 --- a/Makefile +++ b/Makefile @@ -108,6 +108,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 @@ -118,6 +119,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 diff --git a/dep/Makefile b/dep/Makefile index 7c3f884e..a5409d1e 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -119,6 +119,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 @@ -128,6 +133,12 @@ $(libcurl): $(openssl) --without-zlib --without-ca-bundle --without-ca-fallback --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --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 From 64cfeb77d516e47196bd1f4c9d1c1fead6b0015e Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 26 Dec 2017 22:38:59 -0500 Subject: [PATCH 2/4] Add default make dist to plugin.mk --- plugin.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin.mk b/plugin.mk index 1977a1d0..d708d709 100644 --- a/plugin.mk +++ b/plugin.mk @@ -28,3 +28,11 @@ include ../../compile.mk clean: rm -rfv build $(TARGET) dist + +dist: all + rm -rf dist + mkdir -p dist/$(SLUG) + cp -R $(DISTRIBUTABLES) dist/$(SLUG)/ + cd dist && zip -5 -r $(SLUG)-$(VERSION)-$(ARCH).zip $(SLUG) + +.PHONY: clean dist \ No newline at end of file From e054d6b6115a84766a4c2354594e808934463815 Mon Sep 17 00:00:00 2001 From: Jeremy Wentworth Date: Tue, 2 Jan 2018 22:12:52 -0500 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40204931..b094b501 100644 --- a/README.md +++ b/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 From 34de07192ae1ab6fa008344a80b63d9cdc0f0c5d Mon Sep 17 00:00:00 2001 From: Joakim Lindbom Date: Thu, 4 Jan 2018 16:08:31 +0100 Subject: [PATCH 4/4] Added make parameter to control native/common compilation --- compile.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compile.mk b/compile.mk index 0ebc1501..9e6ecf73 100644 --- a/compile.mk +++ b/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