summaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Stefan Fuchs <sfuchs@gmx.de>2017-03-31 22:34:57 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-04-01 08:08:16 -0700
commit12c5a3db691e787bda22b48545080acca0506213 (patch)
tree2c49507f6074d290990f7589d66c40620cc48768 /packaging/windows
parentb919a9d700ce6ef0ad2bf8e887500ffd61c4f8cf (diff)
downloadsubsurface-12c5a3db691e787bda22b48545080acca0506213.tar.gz
Fix mxe-build script to copy correct plugin DLLs for debug and release
For the plugin DDLs: Debug: Only copy *d.DLLs Release: Only copy *.DLLs Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'packaging/windows')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 154d64237..a6d6a1930 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -291,8 +291,18 @@ mkdir -p $STAGING_TESTS_DIR
for d in $QT_PLUGIN_DIRECTORIES
do
- cp -a $d $STAGING_DIR/plugins
- cp -a $d $STAGING_TESTS_DIR
+ mkdir -p $STAGING_DIR/plugins/$(basename $d)
+ mkdir -p $STAGING_TESTS_DIR/$(basename $d)
+ for f in $d/*
+ do
+ 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)
+ elif [[ "$RELEASE" == "Debug" && ! -f ${f//.dll/d.dll} ]] ; then
+ cp $f $STAGING_DIR/plugins/$(basename $d)
+ cp $f $STAGING_TESTS_DIR/$(basename $d)
+ fi
+ done
done
for f in $EXTRA_MANUAL_DEPENDENCIES