From 8f6e95530702fd2fb6f3a0b81731f97b0e00587e Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 19 Feb 2018 22:32:00 +0100
Subject: [PATCH] Cross build: Include the right libpng*.dll within the
 ziprelease

---
 3rdparty/Makefile | 2 ++
 src/Makefile      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/3rdparty/Makefile b/3rdparty/Makefile
index 9db87f85..a357a889 100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@ -28,6 +28,7 @@ FREETYPEURL=https://download.savannah.gnu.org/releases/freetype/$(FREETYPEARCH)
 PREFIX = $(PWD)/usr
 
 MKDIR = mkdir -p
+CP = cp -v
 TAR = $(shell which tar)
 GETURL = $(shell which wget || echo "curl -O -L")
 
@@ -138,6 +139,7 @@ $(PREFIX)/lib/libpng.a:	$(LIBPNG)/.ok
 	cd $(LIBPNG) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib ./configure --prefix=$(PREFIX) --host=$(HOST)
 	cd $(LIBPNG) && $(MAKE)
 	cd $(LIBPNG) && $(MAKE) install
+	$(CP) $(PREFIX)/bin/libpng*.dll ../bin
 
 $(LIBPNG)/.ok:	archives/$(LIBPNGARCH)
 	$(TAR) xzf $<
diff --git a/src/Makefile b/src/Makefile
index 24385b18..8a9798ca 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -75,7 +75,7 @@ ifdef COMSPEC
   PLATFORMOBJ = winres.o
   PLATFORM = win32
   #some misc files we have to add to the release archive under windows.
-  PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll bin/libpng14-14.dll bin/zlib1.dll $(TTFLIBS)
+  PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) bin/zlib1.dll $(TTFLIBS)
   ZIP = zip
 else
 
@@ -378,7 +378,7 @@ endif
       endif
       OBJDIR = ../obj/win32
       PLATFORM = win32
-      PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll bin/libpng14-14.dll bin/zlib1.dll $(TTFLIBS)
+      PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) bin/zlib1.dll $(TTFLIBS)
     else
       ifdef GP2XCROSS
         #cross compile an exec for the gp2x