From 4c8369a7baf5bc3021b8c4aacc2ecf492ac2c583 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 21 Apr 2014 08:41:11 -0700 Subject: More cross building stuff 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 --- packaging/windows/mingw-make.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'packaging/windows') 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 $@ -- cgit v1.2.3-70-g09d2