From 07025fc492b5ff585162b35d49cda8d764e32586 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 20 Jul 2019 14:48:48 -0700 Subject: [PATCH 1/3] Remove OpenSSL from deps on Win. --- Makefile | 4 ++-- dep/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ce956c39..9b291f6c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/dep/Makefile b/dep/Makefile index 7929dd80..78d7e9cf 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -131,7 +131,7 @@ CURL_DEPS += $(openssl) # CURL_FLAGS += --with-secure-transport endif ifdef ARCH_WIN -CURL_FLAGS += --with-schannel +CURL_FLAGS += --with-schannel --without-ssl endif $(libcurl): $(CURL_DEPS) curl-7.64.1 From 2fbf67c287a98c4f2af081310abe08042d7715eb Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 20 Jul 2019 14:56:05 -0700 Subject: [PATCH 2/3] Write stack trace to log.txt on Windows. --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 413105a4..8687640b 100644 --- a/src/main.cpp +++ b/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()); From 4800b327e8575080229f9a50b2a3bbca82af9cfe Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 20 Jul 2019 18:23:37 -0400 Subject: [PATCH 3/3] Bump version. --- Core.json | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core.json b/Core.json index 16335039..f9dfb91d 100644 --- a/Core.json +++ b/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", diff --git a/Makefile b/Makefile index 9b291f6c..7a4c8a74 100644 --- a/Makefile +++ b/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