summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-09-22 09:28:36 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-09-22 20:23:30 -0700
commit3b15ab5f2809b248fa3b30079446e5388ebceeb0 (patch)
treeb2973fd0cc8c78380a26e538aaf95f0da349f1c4 /packaging
parente66f0895c68c149c2eb726e38f5b5dbc00ab2548 (diff)
downloadsubsurface-3b15ab5f2809b248fa3b30079446e5388ebceeb0.tar.gz
MXE build: small tweaks
While this should be fixed in cmake, for now just manuallt get libssrfmarblewidget.dll and QtXml.dll in place Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 7d88f085d..6611549ae 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -297,6 +297,8 @@ fi
# finally, Subsurface
cd $BUILDDIR
+
+# first copy the Qt plugins in place
mkdir -p subsurface/staging/plugins
cd subsurface/staging/plugins
cp -a $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/iconengines .
@@ -304,6 +306,11 @@ cp -a $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats .
cp -a $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms .
cp -a $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/printsupport .
+# for some reason we aren't installing libssrfmarblewidget.dll and # Qt5Xml.dll
+# I need to figure out why and fix that, but for now just manually copy that as well
+cp $BASEDIR/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll $BUILDDIR/subsurface/staging
+cp $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml.dll $BUILDDIR/subsurface/staging
+
cd $BUILDDIR/subsurface
if [[ "$1" == "qmake" ]] ; then