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

MXE build: better logical grouping

Browse source 
This just makes more sense in which variables go with which code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-29 13:41:35 -07:00
parent 26879bffcc
commit 0021f24eef
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
# #
# this file assumes that you have installed MXE on your system # this file assumes that you have installed MXE on your system
# and installed a number of dependencies as well. Latest MXE # and installed a number of dependencies as well. Latest MXE
# version from git may not always work for Qt5 and Subsurface. # version from git may not always work for Qt5 and Subsurface.
# Try to select an older release version like build-2016-10-12. # Try to select an older release version like build-2016-10-12.
# #
# cd ~/src # cd ~/src
@ -261,11 +261,6 @@ $BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/platforms \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/geoservices \ $BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/geoservices \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/printsupport" $BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/printsupport"
# 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
EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Location$DLL_SUFFIX.dll"
STAGING_DIR=$BUILDDIR/subsurface/staging STAGING_DIR=$BUILDDIR/subsurface/staging
STAGING_TESTS_DIR=$BUILDDIR/subsurface/staging_tests STAGING_TESTS_DIR=$BUILDDIR/subsurface/staging_tests
@ -291,6 +286,11 @@ do
done done
done done
# 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
EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Location$DLL_SUFFIX.dll"
for f in $EXTRA_MANUAL_DEPENDENCIES for f in $EXTRA_MANUAL_DEPENDENCIES
do do
cp $f $STAGING_DIR cp $f $STAGING_DIR