From 046e5efcd77a48b10110c22a1bdc19502e400c65 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Sat, 5 Jan 2019 17:06:30 +0100
Subject: [PATCH] Add tiff and jpeg dll to Win32 distrib

---
 install/WinInstaller.nsi | 4 ++--
 src/Makefile             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index f670e701..bc7a2627 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -103,11 +103,11 @@ Section "Grafx2" SecProgram
     File ..\bin\SDL.dll
     File ..\bin\SDL_ttf.dll
     File ..\bin\${FREETYPEDLL}
-    File ..\bin\${JPEGDLL}
-    File ..\bin\${TIFFDLL}
   !endif
   File ..\bin\zlib1.dll
   File ..\bin\${PNGDLL}
+  File ..\bin\${JPEGDLL}
+  File ..\bin\${TIFFDLL}
   SetOutPath "$INSTDIR\share\grafx2"
   File ..\share\grafx2\gfx2.gif
   File ..\share\grafx2\gfx2def.ini
diff --git a/src/Makefile b/src/Makefile
index 1af67b51..fcef2baa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -475,9 +475,9 @@ endif
       PLATFORM = win32
       PLATFORMOBJ = winres.o
       PLATFORMFILES = $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)
+      PLATFORMFILES += bin/libtiff-5.dll
       ifeq ($(API),sdl)
       PLATFORMFILES += bin/SDL.dll bin/SDL_image.dll
-      PLATFORMFILES += bin/libtiff-5.dll
       endif
     else
       ifdef GP2XCROSS