From ddc8d7e36b048687c3888f82c4fe28449f6d7748 Mon Sep 17 00:00:00 2001
From: ArsenArsen <ArsenArsen@users.noreply.github.com>
Date: Fri, 7 Jul 2017 14:38:43 +0200
Subject: [PATCH] Try to bundle more DLLs because with the exe

---
 AppVeyor/make_installer.sh | 44 +++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/AppVeyor/make_installer.sh b/AppVeyor/make_installer.sh
index 40ba302..b95fad4 100644
--- a/AppVeyor/make_installer.sh
+++ b/AppVeyor/make_installer.sh
@@ -3,6 +3,13 @@ function addFile {
     cp $1 .
     echo "Source: \"$(basename $1)\"; DestDir: \"{app}\"; Flags: ignoreversion" >> installer.iss
 }
+
+function addAllFiles {
+    find $1 -type f -iname $2 | while read -r filename; do
+        addFile filename
+    done
+}
+
 ver=$(cat main.cpp | grep setApplicationVersion | sed "s/\\s*a.setApplicationVersion(\"//g" | sed "s/\");//g")
 
 cd packages/windows
@@ -11,23 +18,26 @@ cp ../../KShare.exe . || exit 1
 
 sed "s/;VER;/$ver/" installer.iss.pattern.top > installer.iss
 
-addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avcodec-57.dll
-#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avdevice-57.dll
-#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avfilter-6.dll
-addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avformat-57.dll
-addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avutil-55.dll
-#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/postproc-54.dll
-#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swresample-2.dll
-addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swscale-4.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5Core.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5Gui.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5Widgets.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5WinExtras.dll
-addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
-addFile /c/Qt/5.9/mingw53_32/bin/LIBSTDC++-6.DLL
-addFile /c/Qt/5.9/mingw53_32/bin/LIBWINPTHREAD-1.DLL
-addFile /c/Qt/5.9/mingw53_32/bin/LIBGCC_S_DW2-1.DLL
+#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avcodec-57.dll
+##addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avdevice-57.dll
+##addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avfilter-6.dll
+#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avformat-57.dll
+#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/avutil-55.dll
+##addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/postproc-54.dll
+##addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swresample-2.dll
+#addFile ../../build/ffmpeg-3.3.2-win64-shared/bin/swscale-4.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5Core.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5Gui.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5Widgets.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5WinExtras.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/Qt5Network.dll
+#addFile /c/Qt/5.9/mingw53_32/bin/LIBSTDC++-6.DLL
+#addFile /c/Qt/5.9/mingw53_32/bin/LIBWINPTHREAD-1.DLL
+#addFile /c/Qt/5.9/mingw53_32/bin/LIBGCC_S_DW2-1.DLL
+
+addAllFiles /c/Qt/5.9/mingw53_32/bin/ '*.dll'
+addAllFiles ../../build/ffmpeg-3.3.2-win64-shared/bin/ '*.dll'
 
 cat installer.iss.pattern.bottom >> installer.iss
 "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer.iss