diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-10 12:39:27 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-12-10 13:08:35 -0800 |
| commit | c9f927d5474cc839eb61bbc2c36469d7eb1a6d19 (patch) | |
| tree | 456919259779501ee583b0f4bfd112071270d033 /subsurface-configure.pri | |
| parent | 4ee59bc1b707b89ff96caa1d96fc95e7acfd8b88 (diff) | |
| download | subsurface-c9f927d5474cc839eb61bbc2c36469d7eb1a6d19.tar.gz | |
Updates to Ubuntu package building process
Marble can't be static, so instead we build a shared library but give it a
different name so it can be installed in parallel with the "real"
libmarblewidget.so.
Also make sure that the correct libusb is installed so that Atomics Aquatics
dive computers are supported.
Fixes #782
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-configure.pri')
| -rw-r--r-- | subsurface-configure.pri | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 5f8be2ba4..d2092d3ac 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -156,18 +156,14 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN !isEmpty(LIBMARBLEDEVEL) { # find it next to our sources INCLUDEPATH += $$LIBMARBLEDEVEL/include - isEmpty(LIBMARBLESTATIC) { - LIBS += -L$$LIBMARBLEDEVEL/lib - } + LIBS += -L$$LIBMARBLEDEVEL/lib } !contains(DEFINES, NO_MARBLE) { win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd - else: { - isEmpty(LIBMARBLESTATIC) { - LIBS += -lmarblewidget - } else { - LIBS += $$LIBMARBLEDEVEL/src/lib/marble/libmarblewidget.a - } + else: !isEmpty(SPECIAL_MARBLE_PREFIX) { + LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble -lssrfmarblewidget + } else { + LIBS += -lmarblewidget } } |