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

Ubuntu packaging: include static libmarblewidget

Browse source 
Still all Qt4 based. Baby steps.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-02 15:04:21 -08:00
parent fabdb6b65c
commit a1cd230625
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/ubuntu/control
View file

@ -15,7 +15,6 @@ Build-Depends: asciidoc,
txt2html, txt2html,
libzip-dev, libzip-dev,
libsqlite3-dev, libsqlite3-dev,
libmarble-dev,
autoconf, autoconf,
automake, automake,
cmake, cmake,

12
packaging/ubuntu/rules
View file

@ -12,14 +12,20 @@ override_dh_auto_clean:
(cd libdivecomputer ; make clean || true) (cd libdivecomputer ; make clean || true)
make clean || true make clean || true
rm -rf libgit2/build rm -rf libgit2/build
rm -rf marble-build
rm -f ssrf-version.h rm -f ssrf-version.h
rm -f subsurface rm -f subsurface
rm -f Makefile rm -f Makefile
override_dh_auto_configure: override_dh_auto_configure:
(cd libdivecomputer ; autoreconf --install ; ./configure ; make) (cd libdivecomputer ; autoreconf --install ; ./configure ; make -j8 )
(mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make ) (mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 )
qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 subsurface.pro (mkdir marble-build ; cd marble-build ; \
cmake -DQTONLY=ON -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF -DBUILD_WITH_DBUS=OFF ../marble-source ; \
make -j8 ; \
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; echo ln -s $$i . ; done ; \
ln -s . marble )
qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build LIBMARBLESTATIC=1 subsurface.pro
override_dh_installchangelogs: override_dh_installchangelogs:
dh_installchangelogs dh_installchangelogs

12
subsurface-configure.pri
View file

@ -156,11 +156,19 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
!isEmpty(LIBMARBLEDEVEL) { !isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources # find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/include INCLUDEPATH += $$LIBMARBLEDEVEL/include
LIBS += -L$$LIBMARBLEDEVEL/lib isEmpty(LIBMARBLESTATIC) {
LIBS += -L$$LIBMARBLEDEVEL/lib
}
} }
!contains(DEFINES, NO_MARBLE) { !contains(DEFINES, NO_MARBLE) {
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
else: LIBS += -lmarblewidget else: {
isEmpty(LIBMARBLESTATIC) {
LIBS += -lmarblewidget
} else {
LIBS += $$LIBMARBLEDEVEL/src/lib/marble/libmarblewidget.a
}
}
} }
libgit21-api { libgit21-api {