mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 21:43:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify MXE script

Browse source 
The MXE script still tried to run things using the qmake project
file and we removed that ages ago.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-12-16 14:14:59 -02:00 • committed by Dirk Hohndel
parent 1f960eef74
commit 9d805bea4a
1 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,9 +125,13 @@ exec 1> >(tee ./winbuild.log) 2>&1
# this is run on a rather powerful machine - if you want less # this is run on a rather powerful machine - if you want less
# build parallelism, please change this variable # build parallelism, please change this variable
JOBS="-j12" JOBS="-j4"
BASEDIR=$(cd "$(dirname $0)/.."; pwd)
BUILDDIR=$(cd "$(dirname $0)"; pwd) EXECDIR=`pwd`
BASEDIR=$(cd "$EXECDIR/.."; pwd)
BUILDDIR=$(cd "$EXECDIR"; pwd)
echo $BUILDDIR
if [[ ! -d "$BASEDIR"/mxe ]] ; then if [[ ! -d "$BASEDIR"/mxe ]] ; then
echo "Please start this from the right directory " echo "Please start this from the right directory "
@ -305,6 +309,7 @@ fi
# finally, Subsurface # finally, Subsurface
cd "$BUILDDIR" cd "$BUILDDIR"
echo "Starting Subsurface Build"
# things go weird if we don't create a new build directory... Subsurface # things go weird if we don't create a new build directory... Subsurface
# suddenly gets linked against Qt5Guid.a etc... # suddenly gets linked against Qt5Guid.a etc...
@ -325,34 +330,15 @@ cp "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml.dll "$BUILDDIR"/sub
cd "$BUILDDIR"/subsurface cd "$BUILDDIR"/subsurface
if [[ "$1" == "qmake" ]] ; then cmake -DCMAKE_TOOLCHAIN_FILE="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
shift -DCMAKE_PREFIX_PATH="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5 \
export objdump="$BASEDIR"/mxe/usr/bin/i686-w64-mingw32.shared-objdump -DCMAKE_BUILD_TYPE=$RELEASE \
-DQT_TRANSLATION_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/translations \
i686-w64-mingw32.shared-qmake-qt5 \ -DMAKENSIS=i686-w64-mingw32.shared-makensis \
LIBMARBLEDEVEL=../marble \ -DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \
CROSS_PATH="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared \ -DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
QMAKE_LRELEASE="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/bin/lrelease \ -DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
SPECIAL_MARBLE_PREFIX=1 \ "$BASEDIR"/subsurface
MAKENSIS=i686-w64-mingw32.shared-makensis \
"$BASEDIR"/../subsurface/subsurface.pro
# LIBDCDEVEL=../libdivecomputer \
else
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 \
-DQT_TRANSLATION_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/translations \
-DMAKENSIS=i686-w64-mingw32.shared-makensis \
-DLIBDIVECOMPUTER_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
-DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \
-DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
-DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
"$BASEDIR"/subsurface
#sed -i 's@-lssh2@/home/hohndel/src/win/win32/libgit2/libssh2.dll@g' CMakeFiles/subsurface.dir/link.txt
fi
make $JOBS "$@" make $JOBS "$@"