Browse Source

Use OpenSSL on Windows. Include cacert.pem in dist.

tags/v1.1.3
Andrew Belt 5 years ago
parent
commit
b6e5ad5515
2 changed files with 6 additions and 18 deletions
  1. +5
    -5
      Makefile
  2. +1
    -13
      dep/Makefile

+ 5
- 5
Makefile View File

@@ -38,8 +38,8 @@ endif
ifdef ARCH_WIN
SOURCES += dep/osdialog/osdialog_win.c
LDFLAGS += -Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \
dep/lib/libglew32.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libcurl.a dep/lib/librtaudio.a dep/lib/librtmidi.a \
-lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -lcrypt32 -ldsound -lwinmm -lksuser -lshlwapi -lmfplat -lmfuuid -lwmcodecdspuuid -ldbghelp
dep/lib/libglew32.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/librtaudio.a dep/lib/librtmidi.a \
-lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -ldsound -lwinmm -lksuser -lshlwapi -lmfplat -lmfuuid -lwmcodecdspuuid -ldbghelp
TARGET := Rack.exe
OBJECTS += Rack.res
endif
@@ -103,7 +103,7 @@ ifdef ARCH_LIN
mkdir -p dist/Rack
cp $(TARGET) dist/Rack/
$(STRIP) -s dist/Rack/$(TARGET)
cp -R LICENSE* res Core.json template.vcv dist/Rack/
cp -R LICENSE* res Core.json template.vcv cacert.pem dist/Rack/
# Manually check that no nonstandard shared libraries are linked
ldd dist/Rack/$(TARGET)
cp plugins/Fundamental/dist/*.zip dist/Rack/Fundamental.zip
@@ -119,7 +119,7 @@ ifdef ARCH_MAC
cp $(TARGET) dist/$(TARGET).app/Contents/MacOS/
$(STRIP) -S dist/$(TARGET).app/Contents/MacOS/$(TARGET)
mkdir -p dist/$(TARGET).app/Contents/Resources
cp -R LICENSE* res Core.json template.vcv icon.icns dist/$(TARGET).app/Contents/Resources
cp -R LICENSE* res Core.json template.vcv cacert.pem icon.icns dist/$(TARGET).app/Contents/Resources

# Manually check that no nonstandard shared libraries are linked
otool -L dist/$(TARGET).app/Contents/MacOS/$(TARGET)
@@ -137,7 +137,7 @@ ifdef ARCH_WIN
mkdir -p dist/Rack
cp $(TARGET) dist/Rack/
$(STRIP) -s dist/Rack/$(TARGET)
cp -R LICENSE* res Core.json template.vcv dist/Rack/
cp -R LICENSE* res Core.json template.vcv cacert.pem dist/Rack/
cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
cp /mingw64/bin/libstdc++-6.dll dist/Rack/
cp /mingw64/bin/libgcc_s_seh-1.dll dist/Rack/


+ 1
- 13
dep/Makefile View File

@@ -121,21 +121,9 @@ curl-7.64.1:

CURL_FLAGS += --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-shared --disable-symbol-hiding
CURL_FLAGS += --without-zlib --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --without-brotli
ifdef ARCH_LIN
CURL_FLAGS += --with-ssl="$(DEP_PATH)"
CURL_DEPS += $(openssl)
endif
ifdef ARCH_MAC
# Since Rack supports Mac 10.7 but Apple's Secure Transport only supports TLS 1.0 on that OS, use OpenSSL instead.
# CURL_FLAGS += --with-secure-transport
CURL_FLAGS += --with-ssl="$(DEP_PATH)"
CURL_DEPS += $(openssl)
endif
ifdef ARCH_WIN
CURL_FLAGS += --with-schannel --without-ssl
endif

$(libcurl): $(CURL_DEPS) curl-7.64.1
$(libcurl): $(openssl) curl-7.64.1
cd curl-7.64.1 && PKG_CONFIG_PATH= $(CONFIGURE) $(CURL_FLAGS)
$(MAKE) -C curl-7.64.1
$(MAKE) -C curl-7.64.1 install


Loading…
Cancel
Save