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

Core.json

@@ -1,7 +1,7 @@
 {
   "slug": "Core",
   "name": "Core",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "license": "GPL-3.0-only",
   "author": "VCV",
   "brand": "VCV",

Makefile

@@ -1,6 +1,6 @@
 RACK_DIR ?= .
-VERSION := 1.dev.$(shell git rev-parse --short HEAD)
-# VERSION := 1.1.1
+# VERSION := 1.dev.$(shell git rev-parse --short HEAD)
+VERSION := 1.1.2
 
 FLAGS += -DVERSION=$(VERSION)
 FLAGS += -Iinclude -Idep/include
@@ -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/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
+		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
 	TARGET := Rack.exe
 	OBJECTS += Rack.res
 endif

dep/Makefile

@@ -132,7 +132,7 @@ CURL_FLAGS += --with-ssl="$(DEP_PATH)"
 CURL_DEPS += $(openssl)
 endif
 ifdef ARCH_WIN
-CURL_FLAGS += --with-schannel
+CURL_FLAGS += --with-schannel --without-ssl
 endif
 
 $(libcurl): $(CURL_DEPS) curl-7.64.1

src/main.cpp

@@ -56,6 +56,9 @@ int main(int argc, char *argv[]) {
 		exit(1);
 	}
 	(void) instanceMutex;
+
+	// Don't display "Assertion failed!" dialog message.
+	_set_error_mode(_OUT_TO_STDERR);
 #endif
 
 	std::string patchPath;
@@ -98,7 +101,6 @@ int main(int argc, char *argv[]) {
 	logger::init();
 
 	// We can now install a signal handler and log the output
-#if defined ARCH_LIN || defined ARCH_MAC
 	if (!settings::devMode) {
 		signal(SIGABRT, fatalSignalHandler);
 		signal(SIGFPE, fatalSignalHandler);
@@ -106,7 +108,6 @@ int main(int argc, char *argv[]) {
 		signal(SIGSEGV, fatalSignalHandler);
 		signal(SIGTERM, fatalSignalHandler);
 	}
-#endif
 
 	// Log environment
 	INFO("%s v%s", app::APP_NAME.c_str(), app::APP_VERSION.c_str());