From 9d7113b447aa28e911b662792d159bed260c0821 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 13 Mar 2017 19:14:50 +0300
Subject: Update dlls in windows installers.

---
 packaging/windows/evol.nsi  | 13 ++++++++-----
 packaging/windows/setup.nsi | 15 +++++++++------
 packaging/windows/tmw.nsi   | 15 +++++++++------
 3 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'packaging/windows')

diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index d0529ea08..ea1c64e72 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -256,19 +256,18 @@ Section "Core files (required)" SecCore
   File "${EXEDIR}\manaplus.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
-  File "${DLLDIR}\SDL_mixer.dll"
+;  File "${DLLDIR}\SDL_mixer.dll"
   File "${DLLDIR}\SDL_net.dll"
   File "${DLLDIR}\SDL_ttf.dll"
-  File "${DLLDIR}\exchndl.dll"
+  File "${DLLDIR}\libSDL_gfx-15.dll"
   File "${DLLDIR}\libcurl-4.dll"
-  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libfreetype-6.dll"
+  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libiconv-2.dll"
   File "${DLLDIR}\libintl-8.dll"
   File "${DLLDIR}\libjpeg-9.dll"
   File "${DLLDIR}\libogg-0.dll"
-  File "${DLLDIR}\libpng15-15.dll"
-  File "${DLLDIR}\libSDL_gfx-13.dll"
+  File "${DLLDIR}\libpng16-16.dll"
   File "${DLLDIR}\libstdc++-6.dll"
   File "${DLLDIR}\libvorbis-0.dll"
   File "${DLLDIR}\libvorbisfile-3.dll"
@@ -373,6 +372,10 @@ SectionEnd
 Section /o "Debugger" SecDebug
   SetOutPath "$INSTDIR"
   File "${DLLDIR}\gdb.exe"
+  File "${DLLDIR}\libdl.dll"
+  File "${DLLDIR}\libexpat-1.dll"
+  File "${DLLDIR}\libreadline6.dll"
+  File "${DLLDIR}\libtermcap.dll"
   File "${EXEDIR}\manaplusd.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
     CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index b861d6a3c..e4b6bbf10 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -253,19 +253,18 @@ Section "Core files (required)" SecCore
   File "${EXEDIR}\manaplus.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
-  File "${DLLDIR}\SDL_mixer.dll"
+;  File "${DLLDIR}\SDL_mixer.dll"
   File "${DLLDIR}\SDL_net.dll"
   File "${DLLDIR}\SDL_ttf.dll"
-  File "${DLLDIR}\exchndl.dll"
+  File "${DLLDIR}\libSDL_gfx-15.dll"
   File "${DLLDIR}\libcurl-4.dll"
-  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libfreetype-6.dll"
+  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libiconv-2.dll"
   File "${DLLDIR}\libintl-8.dll"
-  File "${DLLDIR}\libjpeg-8.dll"
+  File "${DLLDIR}\libjpeg-9.dll"
   File "${DLLDIR}\libogg-0.dll"
-  File "${DLLDIR}\libpng15-15.dll"
-  File "${DLLDIR}\libSDL_gfx-13.dll"
+  File "${DLLDIR}\libpng16-16.dll"
   File "${DLLDIR}\libstdc++-6.dll"
   File "${DLLDIR}\libvorbis-0.dll"
   File "${DLLDIR}\libvorbisfile-3.dll"
@@ -374,6 +373,10 @@ SectionEnd
 Section /o "Debugger" SecDebug
   SetOutPath "$INSTDIR"
   File "${DLLDIR}\gdb.exe"
+  File "${DLLDIR}\libdl.dll"
+  File "${DLLDIR}\libexpat-1.dll"
+  File "${DLLDIR}\libreadline6.dll"
+  File "${DLLDIR}\libtermcap.dll"
   File "${EXEDIR}\manaplusd.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
     CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe"
diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi
index 24345c35d..472255a91 100644
--- a/packaging/windows/tmw.nsi
+++ b/packaging/windows/tmw.nsi
@@ -256,19 +256,18 @@ Section "Core files (required)" SecCore
   File "${EXEDIR}\manaplus.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
-  File "${DLLDIR}\SDL_mixer.dll"
+;  File "${DLLDIR}\SDL_mixer.dll"
   File "${DLLDIR}\SDL_net.dll"
   File "${DLLDIR}\SDL_ttf.dll"
-  File "${DLLDIR}\exchndl.dll"
+  File "${DLLDIR}\libSDL_gfx-15.dll"
   File "${DLLDIR}\libcurl-4.dll"
-  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libfreetype-6.dll"
+  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
   File "${DLLDIR}\libiconv-2.dll"
   File "${DLLDIR}\libintl-8.dll"
-  File "${DLLDIR}\libjpeg-8.dll"
+  File "${DLLDIR}\libjpeg-9.dll"
   File "${DLLDIR}\libogg-0.dll"
-  File "${DLLDIR}\libpng15-15.dll"
-  File "${DLLDIR}\libSDL_gfx-13.dll"
+  File "${DLLDIR}\libpng16-16.dll"
   File "${DLLDIR}\libstdc++-6.dll"
   File "${DLLDIR}\libvorbis-0.dll"
   File "${DLLDIR}\libvorbisfile-3.dll"
@@ -373,6 +372,10 @@ SectionEnd
 Section /o "Debugger" SecDebug
   SetOutPath "$INSTDIR"
   File "${DLLDIR}\gdb.exe"
+  File "${DLLDIR}\libdl.dll"
+  File "${DLLDIR}\libexpat-1.dll"
+  File "${DLLDIR}\libreadline6.dll"
+  File "${DLLDIR}\libtermcap.dll"
   File "${EXEDIR}\manaplusd.exe"
   ${If} ${SectionIsSelected} ${SecShortcuts}
     CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 2
-- 
cgit v1.2.3-60-g2f50