From 83348100f341bace96400ebd2ee54116dd14b529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= <antonio_nd@outlook.com>
Date: Mon, 17 Apr 2017 17:28:07 +0100
Subject: [PATCH] Improve MinGW target of Makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It works now with an install of MinGW for both Win32 and Win64. It needs
libpng and zlib.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
---
 Makefile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 492282ce..0925a8ec 100644
--- a/Makefile
+++ b/Makefile
@@ -123,13 +123,23 @@ src/link/parser.h : src/link/parser.c
 # If you're building on Windows with Cygwin or Mingw, just follow the Unix
 # install instructions instead.
 mingw:
-	$Qenv PATH=/usr/local/mingw32/bin:/bin:/usr/bin:/usr/local/bin \
-		make WARNFLAGS= CC=gcc CFLAGS="-I/usr/local/mingw32/include \
-			${CFLAGS}"
-	$Qmv rgbasm rgbasm.exe
-	$Qmv rgblink rgblink.exe
-	$Qmv rgbfix rgbfix.exe
-	$Qmv rgbgfx rgbgfx.exe
+	$Q${RM} win32 win64
+	$Qmkdir win32 win64
+	$Qenv make clean
+	$Qenv PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
+		make CC=i686-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
+	$Qmv rgbasm win32/rgbasm.exe
+	$Qmv rgblink win32/rgblink.exe
+	$Qmv rgbfix win32/rgbfix.exe
+	$Qmv rgbgfx win32/rgbgfx.exe
+	$Qenv make clean
+	$Qenv PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
+		make CC=x86_64-w64-mingw32-gcc YACC=bison WARNFLAGS= -j
+	$Qmv rgbasm win64/rgbasm.exe
+	$Qmv rgblink win64/rgblink.exe
+	$Qmv rgbfix win64/rgbfix.exe
+	$Qmv rgbgfx win64/rgbgfx.exe
+	$Qenv make clean
 
 # Below is a target for the project maintainer to easily create web manuals.
 # It relies on mandoc: http://mdocml.bsd.lv