From 7db3093b1b900548cfdf1b528e12f9888d4250c8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 9 Oct 2013 16:07:18 -0700 Subject: Try hard not to link against a shared libdivecomputer Versioning is wrong. It's not a library shared with other projects. And at least on Mac and Windows we bundle it with the app, anyway. Requested-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- subsurface-configure.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subsurface-configure.pri b/subsurface-configure.pri index b70107f63..045c9b14f 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -48,9 +48,9 @@ PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL) # about it if it doesn't. LIBS += $$system(pkg-config --libs libusb-1.0 2> /dev/null) } else:exists(/usr/local/lib/libdivecomputer.a) { - LIBS += -L/usr/local/lib -ldivecomputer + LIBS += /usr/local/lib/libdivecomputer.a } else:exists(/usr/local/lib64/libdivecomputer.a) { - LIBS += -L/usr/local/lib64 -ldivecomputer + LIBS += /usr/local/lib64/libdivecomputer.a } else:link_pkgconfig { # find it via pkg-config PKGCONFIG += libdivecomputer -- cgit v1.2.3-70-g09d2