Browse Source

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

pull/574/merge
Andrew Belt 6 years ago
parent
commit
56e30a9faf
4 changed files with 9 additions and 7 deletions
  1. +2
    -0
      Makefile
  2. +4
    -2
      dep/Makefile
  3. +1
    -5
      src/app/AddModuleWindow.cpp
  4. +2
    -0
      src/util/request.cpp

+ 2
- 0
Makefile View File

@@ -147,6 +147,8 @@ ifeq ($(ARCH), win)
cp dep/bin/libsamplerate-0.dll dist/Rack/
cp dep/bin/libzip-5.dll dist/Rack/
cp dep/bin/librtaudio.dll dist/Rack/
cp dep/bin/libcrypto-1_1-x64.dll dist/Rack/
cp dep/bin/libssl-1_1-x64.dll dist/Rack/
mkdir -p dist/Rack/plugins
cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/
# Make ZIP


+ 4
- 2
dep/Makefile View File

@@ -53,7 +53,8 @@ ifeq ($(ARCH),win)
libcurl = bin/libcurl-4.dll
libzip = bin/libzip-5.dll
rtmidi = bin/librtmidi-4.dll
rtaudio = bin/librtaudio-6.dll
rtaudio = bin/librtaudio.dll
openssl = bin/libssl-1_1-x64.dll
endif

# Library configuration
@@ -130,7 +131,8 @@ $(libcurl): $(openssl)
$(UNTAR) curl-7.56.0.tar.gz
cd curl-7.56.0 && ./configure --prefix="$(LOCAL)" \
--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 \
--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)"
--without-zlib --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 \
--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)


+ 1
- 5
src/app/AddModuleWindow.cpp View File

@@ -70,7 +70,7 @@ struct MetadataMenu : ListMenu {

// Plugin metadata
if (!model->plugin->website.empty()) {
addChild(construct<UrlItem>(&MenuEntry::text, "Website", &UrlItem::url, model->plugin->path));
addChild(construct<UrlItem>(&MenuEntry::text, "Website", &UrlItem::url, model->plugin->website));
}
if (!model->plugin->manual.empty()) {
addChild(construct<UrlItem>(&MenuEntry::text, "Manual", &UrlItem::url, model->plugin->manual));
@@ -120,10 +120,6 @@ struct ModelItem : MenuItem {
sModel = model;
MenuItem::onMouseEnter(e);
}
void onMouseLeave(EventMouseLeave &e) override {
sModel = NULL;
MenuItem::onMouseLeave(e);
}
};




+ 2
- 0
src/util/request.cpp View File

@@ -80,6 +80,7 @@ json_t *requestJson(RequestMethod method, std::string url, json_t *dataJ) {
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, reqStr);

std::string resText;
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeStringCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &resText);

@@ -132,6 +133,7 @@ bool requestDownload(std::string url, std::string filename, float *progress) {
curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, xferInfoCallback);
curl_easy_setopt(curl, CURLOPT_XFERINFODATA, progress);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);

info("Downloading %s", url.c_str());
CURLcode res = curl_easy_perform(curl);


Loading…
Cancel
Save