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

More cross building stuff

Browse source 
This is all mostly to make my life easier.
I'm not thrilled with the marble changes - as Linus pointed out before the
way we do these "LIBxxxDEVEL" changes is broken as it will still first
link against any library installed in the system. But since I have removed
any globally installed copies of these libraries this actually works for
me and it does help when experimenting with different build options for
the main libraries that we depend on.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-04-21 08:41:11 -07:00
parent 24792f402d
commit 4c8369a7ba
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/windows/mingw-make.sh
View file

@ -5,13 +5,20 @@
#
# the paths work for the default mingw32 install on Fedora - adjust as
# necessary
# this assumes that local cross builds for libdivecomputer and libgit2
# are in ../libdivecomputer and ../libgit2
# force recreation of the nsi file in order to get the correct version
# number
# force recreation of the nsi file and Subsurface version header file
# in order to get the correct version number
BASEDIR=$(dirname $0)
rm $BASEDIR/subsurface.nsi > /dev/null 2>&1
rm $BASEDIR/../../ssrf-version.h > /dev/null 2>&1
export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api $BASEDIR/../../subsurface.pro
mingw32-qmake-qt4 \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
LIBDCDEVEL=../libdivecomputer \
LIBMARBLEDEVEL=../marble \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
$BASEDIR/../../subsurface.pro
mingw32-make $@

13
subsurface-configure.pri
View file

@ -144,9 +144,16 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
#
# Find libmarble
#
# Before Marble 4.9, the GeoDataTreeModel.h header wasn't installed
# Check if it's present by trying to compile
# ### FIXME: implement that
!isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/graphicsview
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata/parser
INCLUDEPATH += $$LIBMARBLEDEVEL/src/lib/marble/geodata/data
LIBS += -L$$LIBMARBLEDEVEL/build/src/lib/marble
}
!contains(DEFINES, NO_MARBLE) {
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
else: LIBS += -lmarblewidget