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

Makefile

@@ -15,8 +15,8 @@ STRIP ?= strip
 
 # Sources and build flags
 
-SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 SOURCES += dep/nanovg/src/nanovg.c
+SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 
 ifeq ($(ARCH), mac)
 	SOURCES += dep/osdialog/osdialog_mac.m
@@ -30,11 +30,10 @@ endif
 
 ifeq ($(ARCH), win)
 	SOURCES += dep/osdialog/osdialog_win.c
-	LDFLAGS += -static-libgcc -static-libstdc++ -lpthread -lws2_32 \
+	LDFLAGS += -static \
 		-Wl,--export-all-symbols,--out-implib,libRack.a -mwindows \
-		-lgdi32 -lopengl32 -lcomdlg32 -lole32 \
-		-Ldep/lib -lglew32 -lglfw3dll -lcurl -lzip -lrtaudio -lrtmidi -lcrypto -lssl \
-		-Wl,-Bstatic -ljansson -lspeexdsp
+		-Ldep/lib -lglew32 -lglfw3 -ljansson -lspeexdsp -lzip -lz -lcurl -lssl -lcrypto -lrtaudio -lrtmidi \
+		-lpthread -lopengl32 -lgdi32 -lws2_32 -lcomdlg32 -lole32 -ldsound -lwinmm -lksuser
 	TARGET := Rack.exe
 	OBJECTS += Rack.res
 endif
@@ -128,19 +127,8 @@ ifeq ($(ARCH), win)
 	cp $(TARGET) dist/Rack/
 	$(STRIP) -s dist/Rack/$(TARGET)
 	cp /mingw64/bin/libwinpthread-1.dll dist/Rack/
-	cp /mingw64/bin/zlib1.dll dist/Rack/
 	cp /mingw64/bin/libstdc++-6.dll dist/Rack/
 	cp /mingw64/bin/libgcc_s_seh-1.dll dist/Rack/
-	cp dep/bin/glew32.dll dist/Rack/
-	cp dep/bin/glfw3.dll dist/Rack/
-	cp dep/bin/libcurl-4.dll dist/Rack/
-	cp dep/bin/libjansson-4.dll dist/Rack/
-	cp dep/bin/librtmidi-4.dll dist/Rack/
-	cp dep/bin/libspeexdsp-1.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/
 	cp plugins/Fundamental/dist/Fundamental-*.zip dist/Rack/Fundamental.zip
 	# Make ZIP
 	cd dist && zip -5 -r Rack-$(VERSION)-$(ARCH).zip Rack

dep/Makefile

@@ -33,16 +33,16 @@ ifeq ($(ARCH), mac)
 endif
 
 ifeq ($(ARCH), win)
-	glew = bin/glew32.dll
-	glfw = bin/glfw3.dll
-	jansson = bin/libjansson-4.dll
-	libspeexdsp = bin/libspeexdsp-1.dll
-	libcurl = bin/libcurl-4.dll
-	libzip = bin/libzip-5.dll
+	glew = lib/libglew32.a
+	glfw = lib/libglfw3.a
+	jansson = lib/libjansson.a
+	libspeexdsp = lib/libspeexdsp.a
+	libcurl = lib/libcurl.a
+	libzip = lib/libzip.a
 	zlib = lib/libz.a
-	rtmidi = bin/librtmidi-4.dll
-	rtaudio = bin/librtaudio.dll
-	openssl = bin/libssl-1_1-x64.dll
+	rtmidi = lib/librtmidi.a
+	rtaudio = lib/librtaudio.a
+	openssl = lib/libssl.a
 endif
 
 nanovg = include/nanovg.h
@@ -59,6 +59,8 @@ include $(RACK_DIR)/dep.mk
 $(glew):
 	$(WGET) https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz
 	$(UNTAR) glew-2.1.0.tgz
+	# For some unknown reason, defining LDFLAGS.EXTRA when building glew.lib on Windows makes linking fail.
+	$(MAKE) -C glew-2.1.0 CFLAGS.EXTRA="$(CFLAGS)" glew.lib
 	$(MAKE) -C glew-2.1.0 CFLAGS.EXTRA="$(CFLAGS)" LDFLAGS.EXTRA="$(LDFLAGS)" GLEW_DEST="$(realpath $(DEP_LOCAL))" LIBDIR="$(realpath $(DEP_LOCAL))/lib" install
 
 $(glfw):
@@ -109,9 +111,14 @@ $(libzip): $(zlib)
 $(zlib):
 	$(WGET) https://www.zlib.net/zlib-1.2.11.tar.gz
 	$(UNTAR) zlib-1.2.11.tar.gz
+ifeq ($(ARCH), win)
+	$(MAKE) -C zlib-1.2.11 -f win32/Makefile.gcc
+	$(MAKE) -C zlib-1.2.11 -f win32/Makefile.gcc BINARY_PATH="$(realpath $(DEP_LOCAL))/bin" INCLUDE_PATH="$(realpath $(DEP_LOCAL))/include" LIBRARY_PATH="$(realpath $(DEP_LOCAL))/lib" install
+else
 	cd zlib-1.2.11 && $(CONFIGURE)
 	$(MAKE) -C zlib-1.2.11
 	$(MAKE) -C zlib-1.2.11 install
+endif
 
 $(rtmidi):
 	$(WGET) https://vcvrack.com/downloads/dep/rtmidi.tgz
@@ -120,21 +127,21 @@ $(rtmidi):
 	$(MAKE) -C rtmidi
 	$(MAKE) -C rtmidi install
 
-ifeq ($(ARCH),mac)
+ifeq ($(ARCH), mac)
 RTAUDIO_FLAGS += -DAUDIO_OSX_CORE=ON
 endif
-ifeq ($(ARCH),win)
+ifeq ($(ARCH), win)
 RTAUDIO_FLAGS += -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_ASIO=ON
 endif
-ifeq ($(ARCH),lin)
+ifeq ($(ARCH), lin)
 RTAUDIO_FLAGS += -DAUDIO_LINUX_ALSA=ON -DAUDIO_UNIX_JACK=ON
 endif
 
 ifdef RTAUDIO_ALL_APIS
-ifeq ($(ARCH),mac)
+ifeq ($(ARCH), mac)
 RTAUDIO_FLAGS += -DAUDIO_UNIX_JACK=ON
 endif
-ifeq ($(ARCH),lin)
+ifeq ($(ARCH), lin)
 RTAUDIO_FLAGS += -DAUDIO_LINUX_PULSE=ON
 endif
 endif
@@ -160,4 +167,5 @@ $(osdialog):
 	cp osdialog/*.h include/
 
 clean:
-	git clean -ffdx
+	git clean -fdx
+	git submodule foreach git clean -fdx

include/window.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include "widgets.hpp"
+#define GLEW_STATIC
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 

src/plugin.cpp

@@ -15,6 +15,7 @@
 #include <thread>
 #include <stdexcept>
 
+#define ZIP_STATIC
 #include <zip.h>
 #include <jansson.h>
 

src/util/request.cpp

@@ -1,5 +1,6 @@
 #include "util/common.hpp"
 #include "util/request.hpp"
+#define CURL_STATICLIB
 #include <curl/curl.h>
 #include <openssl/sha.h>
 

src/widgets/FramebufferWidget.cpp

@@ -1,6 +1,5 @@
 #include "widgets.hpp"
 #include "window.hpp"
-#include <GL/glew.h>
 #include "nanovg_gl.h"
 #include "nanovg_gl_utils.h"