diff options
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 15 | ||||
| -rw-r--r-- | subsurface-configure.pri | 13 |
2 files changed, 21 insertions, 7 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 794a8521a..a1596fd53 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -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 $@ diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 5177c9d68..be79eff32 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -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 |