From 81b51aaee15d085c50a1c3d466f482b984d3c8cf Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Mon, 18 Mar 2019 01:55:30 -0400
Subject: [PATCH] Statically link libgcc and libstdc++ on Linux.

---
 Makefile                     | 9 ++++-----
 src/app/RackScrollWidget.cpp | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index aa7f2297..2981056a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,9 @@ SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 ifdef ARCH_LIN
 	SOURCES += dep/osdialog/osdialog_gtk2.c
 	CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
-	LDFLAGS += -rdynamic \
-		-Ldep/lib \
-		-Wl,-Bstatic -lglfw3 -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
-		-Wl,-Bdynamic -lpthread -lGL -ldl -lX11 -lasound -ljack \
+	LDFLAGS += -rdynamic -static-libgcc -static-libstdc++ \
+		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
+		-lpthread -lGL -ldl -lX11 -lasound -ljack \
 		$(shell pkg-config --libs gtk+-2.0)
 	TARGET := Rack
 endif
@@ -31,7 +30,7 @@ ifdef ARCH_MAC
 	SOURCES += dep/osdialog/osdialog_mac.m
 	LDFLAGS += -lpthread -ldl \
 		-framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework CoreAudio -framework CoreMIDI \
-		-Ldep/lib dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtaudio.a dep/lib/librtmidi.a dep/lib/libcrypto.a dep/lib/libssl.a dep/lib/libcurl.a
+		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtaudio.a dep/lib/librtmidi.a dep/lib/libcrypto.a dep/lib/libssl.a dep/lib/libcurl.a
 	TARGET := Rack
 endif
 
diff --git a/src/app/RackScrollWidget.cpp b/src/app/RackScrollWidget.cpp
index 53439524..638d2697 100644
--- a/src/app/RackScrollWidget.cpp
+++ b/src/app/RackScrollWidget.cpp
@@ -113,7 +113,7 @@ void RackScrollWidget::onHoverScroll(const widget::HoverScrollEvent &e) {
 
 void RackScrollWidget::reset() {
 	offset = RACK_OFFSET.mult(zoomWidget->zoom);
-	offset = offset.minus(math::Vec(20, 20));
+	offset = offset.minus(math::Vec(60, 60));
 }