From 4eead5974da240ff886a111e1b2ea0284f38587f Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Fri, 30 Nov 2018 19:10:36 +0100
Subject: [PATCH] Add libtiff-5.dll to install.

---
 3rdparty/Makefile        | 3 +++
 install/WinInstaller.nsi | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/3rdparty/Makefile b/3rdparty/Makefile
index cd09080c..26031272 100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@ -174,6 +174,9 @@ $(PREFIX)/lib/libtiff.a:	$(LIBTIFF)/.ok
 	  --with-jpeg-include-dir=$(PREFIX)/include --with-jpeg-lib-dir=$(PREFIX)/lib
 	cd $(LIBTIFF) && $(MAKE)
 	cd $(LIBTIFF) && $(MAKE) install
+ifdef WIN32CROSS
+	$(CP) $(PREFIX)/bin/libtiff*.dll ../bin
+endif
 
 $(LIBTIFF)/.ok:	archives/$(LIBTIFFARCH)
 	$(TAR) xzf $<
diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index c2cfb81c..5b1a7018 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -9,6 +9,7 @@
 !define FREETYPEDLL libfreetype-6.dll
 !define JPEGDLL     libjpeg-9.dll
 !define PNGDLL      libpng16-16.dll
+!define TIFFDLL     libtiff-5.dll
 
 ;--------------------------------
 ;Include Modern UI
@@ -101,6 +102,7 @@ Section "Grafx2" SecProgram
   File ..\bin\${JPEGDLL}
   File ..\bin\zlib1.dll
   File ..\bin\${PNGDLL}
+  File ..\bin\${TIFFDLL}
   SetOutPath "$INSTDIR\share\grafx2"
   File ..\share\grafx2\gfx2.gif
   File ..\share\grafx2\gfx2def.ini
@@ -197,6 +199,7 @@ Section "un.SecProgram"
   Delete "$INSTDIR\bin\${FREETYPEDLL}"
   Delete "$INSTDIR\bin\zlib1.dll"
   Delete "$INSTDIR\bin\${PNGDLL}"
+  Delete "$INSTDIR\bin\${TIFFDLL}"
   Delete "$INSTDIR\bin\stdout.txt"
   Delete "$INSTDIR\bin\stderr.txt"
   RMDir  "$INSTDIR\bin"