Browse Source

Statically link libgcc and libstdc++ on Linux.

tags/v1.0.0
Andrew Belt 6 years ago
parent
commit
81b51aaee1
2 changed files with 5 additions and 6 deletions
  1. +4
    -5
      Makefile
  2. +1
    -1
      src/app/RackScrollWidget.cpp

+ 4
- 5
Makefile View File

@@ -19,10 +19,9 @@ SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
ifdef ARCH_LIN ifdef ARCH_LIN
SOURCES += dep/osdialog/osdialog_gtk2.c SOURCES += dep/osdialog/osdialog_gtk2.c
CFLAGS += $(shell pkg-config --cflags gtk+-2.0) 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) $(shell pkg-config --libs gtk+-2.0)
TARGET := Rack TARGET := Rack
endif endif
@@ -31,7 +30,7 @@ ifdef ARCH_MAC
SOURCES += dep/osdialog/osdialog_mac.m SOURCES += dep/osdialog/osdialog_mac.m
LDFLAGS += -lpthread -ldl \ LDFLAGS += -lpthread -ldl \
-framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -framework CoreAudio -framework CoreMIDI \ -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 TARGET := Rack
endif endif




+ 1
- 1
src/app/RackScrollWidget.cpp View File

@@ -113,7 +113,7 @@ void RackScrollWidget::onHoverScroll(const widget::HoverScrollEvent &e) {


void RackScrollWidget::reset() { void RackScrollWidget::reset() {
offset = RACK_OFFSET.mult(zoomWidget->zoom); offset = RACK_OFFSET.mult(zoomWidget->zoom);
offset = offset.minus(math::Vec(20, 20));
offset = offset.minus(math::Vec(60, 60));
} }






Loading…
Cancel
Save