1 files changed, 16 insertions, 9 deletions
diff --git a/win32/merge.sh b/win32/merge.sh
index 797d5e9..8db5fc8 100644
--- a/win32/merge.sh
+++ b/win32/merge.sh
@@ -2,18 +2,19 @@
 
 # Quick-and-dirty script for updating a Windows release folder
 
+srcdir=$(dirname "$(readlink -f "$0")")
+
+rm -rf /C/aud-win32/bin/share
 rm -rf /C/aud-win32/share/locale
 
 cd /C/aud-win32
 for i in `find -type f` ; do
-    if test -f /C/audacious/win32/override/$i ; then
-        cp /C/audacious/win32/override/$i $i
-    elif test -f /C/msys32/mingw32/$i ; then
-        cp /C/msys32/mingw32/$i $i
-    elif test -f /C/Qt/5.12.5/mingw73_32/$i ; then
-        cp /C/Qt/5.12.5/mingw73_32/$i $i
-    elif test -f /C/GTK/$i ; then
-        cp /C/GTK/$i $i
+    if test -f ${srcdir}/override/$i ; then
+        cp ${srcdir}/override/$i $i
+    elif test -f /C/msys64/mingw32/$i ; then
+        cp /C/msys64/mingw32/$i $i
+    elif test -f /C/msys64/mingw32/share/qt5/plugins/${i#"./bin/"} ; then
+        cp /C/msys64/mingw32/share/qt5/plugins/${i#"./bin/"} $i
     elif test -f /C/libs/$i ; then
         cp /C/libs/$i $i
     elif test -f /C/aud/$i ; then
@@ -26,7 +27,13 @@ done
 for i in `find -name *.dll` ; do strip -s $i ; done
 for i in `find -name *.exe` ; do strip -s $i ; done
 
-cd /C/GTK
+cd /C/msys64/mingw32/share/qt5/translations
+mkdir -p /C/aud-win32/bin/share/qt5/translations
+for i in `find . -name '*qt_*' ! -name '*qt_help_*' -o -name '*qtbase_*'` ; do
+    cp $i /C/aud-win32/bin/share/qt5/translations/$i
+done
+
+cd /C/libs
 for i in `find ./share/locale -name gtk20.mo` ; do
     mkdir -p /C/aud-win32/${i%%/gtk20.mo}
     cp $i /C/aud-win32/$i