From 07c93d76afbc395e71bbd5684260f24b49a729c8 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Tue, 8 Oct 2013 16:49:42 +0000
Subject: [PATCH] favour mingw64 toolchain over the older mingw32 toolchain,
 because the headers associated with the toolchain are more up to date.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4498 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index effafec86..f4a161870 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -34,18 +34,20 @@ WHOAMI:=$(shell whoami)
 ifeq ($(FTE_TARGET),win32)
 	ifeq ($(shell $(CC) -v 2>&1 | grep mingw),)
 		#CC didn't state that it was mingw... so try fixing that up
-		ifneq ($(shell which i686-w64-mingw32-gcc 2> /dev/null),)
-			#yup, the alternative exists (this matches the one debian has)
-			CC=i686-w64-mingw32-gcc
-			WINDRES=i686-w64-mingw32-windres
-			STRIP=i686-w64-mingw32-strip
-#			BITS?=32
-		endif
+		#old/original mingw project, headers are not very up to date.
 		ifneq ($(shell which i586-mingw32msvc-gcc 2> /dev/null),)
 			#yup, the alternative exists (this matches the one debian has)
 			CC=i586-mingw32msvc-gcc
 			WINDRES=i586-mingw32msvc-windres
 			STRIP=i586-mingw32msvc-strip
+#			BITS?=32
+		endif
+		#mingw64 provides a 32bit toolchain too, which has more up to date header files than the mingw32 project. so favour that if its installed.
+		ifneq ($(shell which i686-w64-mingw32-gcc 2> /dev/null),)
+			#yup, the alternative exists (this matches the one debian has)
+			CC=i686-w64-mingw32-gcc
+			WINDRES=i686-w64-mingw32-windres
+			STRIP=i686-w64-mingw32-strip
 #			BITS?=32
 		endif
 	endif