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

MXE: switch to i686-w64-mingw32.shared.posix.dw2

Browse source 
This allows us to build QtWebKit again.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-11-13 20:42:52 -08:00
parent 9da3988ec6
commit cb89ee49a3
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
packaging/windows/mxe-based-build.sh
View file

@ -17,7 +17,7 @@
# JOBS := 1 # JOBS := 1
# #
# # This variable controls the targets that will build. # # This variable controls the targets that will build.
# MXE_TARGETS := i686-w64-mingw32.shared # MXE_TARGETS := i686-w64-mingw32.shared.posix.dw2
# #
# # Uncomment the next line if you want to do debug builds later # # Uncomment the next line if you want to do debug builds later
# # qtbase_CONFIGURE_OPTS=-debug-and-release # # qtbase_CONFIGURE_OPTS=-debug-and-release
@ -101,6 +101,7 @@ EXECDIR=`pwd`
BASEDIR=$(cd "$EXECDIR/.."; pwd) BASEDIR=$(cd "$EXECDIR/.."; pwd)
BUILDDIR=$(cd "$EXECDIR"; pwd) BUILDDIR=$(cd "$EXECDIR"; pwd)
MXEDIR=${MXEDIR:-mxe} MXEDIR=${MXEDIR:-mxe}
MXEBUILDTYPE="i686-w64-mingw32.shared.posix.dw2"
echo $BUILDDIR echo $BUILDDIR
@ -112,7 +113,7 @@ fi
echo "Building in $BUILDDIR ..." echo "Building in $BUILDDIR ..."
export PATH="$BASEDIR"/"$MXEDIR"/usr/bin:$PATH:"$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/ export PATH="$BASEDIR"/"$MXEDIR"/usr/bin:$PATH:"$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/
export CXXFLAGS=-std=c++11 export CXXFLAGS=-std=c++11
if [[ "$1" == "debug" ]] ; then if [[ "$1" == "debug" ]] ; then
@ -143,7 +144,7 @@ if [[ ! -d grantlee || -f build.grantlee ]] ; then
rm -f build.grantlee rm -f build.grantlee
mkdir -p grantlee mkdir -p grantlee
cd grantlee cd grantlee
i686-w64-mingw32.shared-cmake \ "$MXEBUILDTYPE"-cmake \
-DCMAKE_BUILD_TYPE=$RELEASE \ -DCMAKE_BUILD_TYPE=$RELEASE \
-DBUILD_TESTS=OFF \ -DBUILD_TESTS=OFF \
"$BASEDIR"/grantlee "$BASEDIR"/grantlee
@ -175,10 +176,10 @@ if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] || [ ! -d libdivecomputer ] || [ -f bu
cd libdivecomputer cd libdivecomputer
"$BASEDIR"/subsurface/libdivecomputer/configure \ "$BASEDIR"/subsurface/libdivecomputer/configure \
CC=i686-w64-mingw32.shared-gcc \ CC="$MXEBUILDTYPE"-gcc \
--host=i686-w64-mingw32.shared \ --host="$MXEBUILDTYPE" \
--enable-shared \ --enable-shared \
--prefix="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared --prefix="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"
make $JOBS make $JOBS
make install make install
else else
@ -199,7 +200,7 @@ if [[ ! -d googlemaps || -f build.googlemaps ]] ; then
cd "$BUILDDIR" cd "$BUILDDIR"
mkdir -p googlemaps mkdir -p googlemaps
cd googlemaps cd googlemaps
"$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/qmake PREFIX=$"$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared "$BASEDIR"/googlemaps/googlemaps.pro "$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/qmake PREFIX=$"$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE" "$BASEDIR"/googlemaps/googlemaps.pro
make $JOBS $RELEASE_GM make $JOBS $RELEASE_GM
make "$RELEASE_GM"-install make "$RELEASE_GM"-install
fi fi
@ -215,11 +216,11 @@ echo "Starting Subsurface Build"
rm -rf subsurface rm -rf subsurface
# first copy the Qt plugins in place # first copy the Qt plugins in place
QT_PLUGIN_DIRECTORIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/iconengines \ QT_PLUGIN_DIRECTORIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/iconengines \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/imageformats \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/platforms \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/platforms \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/geoservices \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/geoservices \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/printsupport" $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/printsupport"
STAGING_DIR=$BUILDDIR/subsurface/staging STAGING_DIR=$BUILDDIR/subsurface/staging
STAGING_TESTS_DIR=$BUILDDIR/subsurface/staging_tests STAGING_TESTS_DIR=$BUILDDIR/subsurface/staging_tests
@ -247,9 +248,9 @@ do
done done
# next we need the QML modules # next we need the QML modules
QT_QML_MODULES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtQuick.2 \ QT_QML_MODULES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtQuick.2 \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtLocation \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtLocation \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtPositioning" $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/qml/QtPositioning"
mkdir -p $STAGING_DIR/qml mkdir -p $STAGING_DIR/qml
@ -260,8 +261,8 @@ done
# for some reason we aren't installing Qt5Xml.dll and Qt5Location.dll # for some reason we aren't installing Qt5Xml.dll and Qt5Location.dll
# I need to figure out why and fix that, but for now just manually copy that as well # I need to figure out why and fix that, but for now just manually copy that as well
EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \ EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Location$DLL_SUFFIX.dll" $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Location$DLL_SUFFIX.dll"
for f in $EXTRA_MANUAL_DEPENDENCIES for f in $EXTRA_MANUAL_DEPENDENCIES
do do
@ -271,13 +272,13 @@ done
cd "$BUILDDIR"/subsurface cd "$BUILDDIR"/subsurface
i686-w64-mingw32.shared-cmake \ "$MXEBUILDTYPE"-cmake \
-DCMAKE_PREFIX_PATH="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5 \ -DCMAKE_PREFIX_PATH="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5 \
-DCMAKE_BUILD_TYPE=$RELEASE_MAIN \ -DCMAKE_BUILD_TYPE=$RELEASE_MAIN \
-DQT_TRANSLATION_DIR="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/translations \ -DQT_TRANSLATION_DIR="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/translations \
-DMAKENSIS=i686-w64-mingw32.shared-makensis \ -DMAKENSIS="$MXEBUILDTYPE"-makensis \
-DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/include \ -DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/include \
-DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/lib/libdivecomputer.dll.a \
-DMAKE_TESTS=OFF \ -DMAKE_TESTS=OFF \
-DBTSUPPORT=ON -DBLESUPPORT=ON \ -DBTSUPPORT=ON -DBLESUPPORT=ON \
-DFTDISUPPORT=$FTDI \ -DFTDISUPPORT=$FTDI \