mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates to Ubuntu package building process

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2014-12-10 12:39:27 -08:00
parent 4ee59bc1b7
commit c9f927d547
5 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsurface-configure.pri
View file

@ -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
}
}