From a38c1cd1f1f7783fa2e2ae86a7f678861f462b0a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 11 Feb 2021 09:57:51 +0100 Subject: [PATCH] Exclude dbgelp shared libraries from binary bundles --- tools/x-win/package.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 91ea0ef63e..49eb46d8bf 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -159,7 +159,15 @@ cp $PREFIX/bin/*.yes $DESTDIR/bin/ || true cp $PREFIX/lib/*.dll $DESTDIR/bin/ # special case libportaudio (wasapi), old stack has no wasapi and hence no .xp cp $PREFIX/bin/libportaudio-2.xp $DESTDIR/bin/ || cp $PREFIX/bin/libportaudio-2.dll $DESTDIR/bin/libportaudio-2.xp + +# prefer system-wide DLL rm -rf $DESTDIR/bin/libjack*.dll +# Also for these (even though M$ recommends to bundle these [1], +# there is no single set that works on all target systems, particularly +# since some plugins also rely on it. +# [1] https://docs.microsoft.com/en-us/windows/win32/debug/calling-the-dbghelp-library +rm -rf $DESTDIR/bin/dbghelp*.dll +rm -rf $DESTDIR/bin/dbgcore*.dll cp `find build/libs/surfaces/ -iname "*.dll"` $ALIBDIR/surfaces/ cp `find build/libs/backends/ -iname "*.dll"` $ALIBDIR/backends/