summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-29 13:11:47 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-29 13:25:41 -0700
commit4c0cac067c254babf8376e8dfae3319fdd7a859b (patch)
treeb8ab3bc7e7ee3ec5bc7d9b3a88cd3bd45b29bde6
parented8f8fba17118a79208a6a8bbbf36bc0c22177fd (diff)
downloadsubsurface-4c0cac067c254babf8376e8dfae3319fdd7a859b.tar.gz
MXE build: install esri plugin
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rwxr-xr-xpackaging/windows/mxe-based-build.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 73d0ca585..edfe3405d 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -258,6 +258,7 @@ rm -rf subsurface
QT_PLUGIN_DIRECTORIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/iconengines \
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats \
$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/printsupport"
# for some reason we aren't installing Qt5Xml.dll
@@ -276,6 +277,9 @@ do
mkdir -p $STAGING_TESTS_DIR/$(basename $d)
for f in $d/*
do
+ if [[ "$d" =~ geoservice ]] && [[ ! "$f" =~ esri ]] ; then
+ continue
+ fi
if [[ "$RELEASE" == "Release" ]] && ([[ ! -f ${f//d.dll/.dll} || "$f" == "${f//d.dll/.dll}" ]]) ; then
cp $f $STAGING_DIR/plugins/$(basename $d)
cp $f $STAGING_TESTS_DIR/$(basename $d)