Browse Source

Merge branch 'v0.5' of github.com:VCVRack/Rack into v0.5

pull/574/merge
Andrew Belt 6 years ago
parent
commit
7820609e24
2 changed files with 13 additions and 0 deletions
  1. +2
    -0
      Makefile
  2. +11
    -0
      dep/Makefile

+ 2
- 0
Makefile View File

@@ -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


+ 11
- 0
dep/Makefile View File

@@ -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


Loading…
Cancel
Save