aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-08 14:11:10 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-04-08 14:24:03 -0700
commit3a06bb37d4b23b15d453da031ed5d7eb56bc65b9 (patch)
treeb1019513ad871bc77a4305321c19d04762f2ddc5 /packaging
parent5b1d7541dddc230c5defef2b9107c2d2fe328426 (diff)
downloadsubsurface-3a06bb37d4b23b15d453da031ed5d7eb56bc65b9.tar.gz
Update build script to cross build Windows using mxe
The MinGW based script is still there for reference, but that's no longer how I build the Windows binaries. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh25
1 files changed, 12 insertions, 13 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 0eb634a98..d79242118 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -148,16 +148,15 @@ if [ ! -d staging ] ; then
cd ../..
fi
-export objdump=$BASEDIR/mxe/usr/bin/i686-w64-mingw32.shared-objdump
-
-i686-w64-mingw32.shared-qmake-qt5 \
- LIBMARBLEDEVEL=../marble \
- LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
- LIBDCDEVEL=../libdivecomputer \
- QMAKE_LRELEASE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/lrelease \
- SPECIAL_MARBLE_PREFIX=1 \
- MAKENSIS=i686-w64-mingw32.shared-makensis \
- $BASEDIR/../subsurface/subsurface.pro
-
-
-make -j12 $@
+cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
+ -DCMAKE_PREFIX_PATH=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5 \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIBDCDEVEL=$BUILDDIR/libdivecomputer \
+ -DLIBGIT2DEVEL=$BUILDDIR/libgit2 \
+ -DLIBMARBLEDEVEL=$BUILDDIR/marble \
+ -DLRELEASE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/lrelease \
+ -DQT_TRANSLATION_DIR=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/translations \
+ -DMAKENSIS=i686-w64-mingw32.shared-makensis \
+ $BASEDIR/../subsurface
+
+make -j12 VERBOSE=1 $@