From 74e282a3d3af94e7f0c3c3b18f4740f849d7f618 Mon Sep 17 00:00:00 2001
From: Matt Klich <matt.klich@readytalk.com>
Date: Mon, 17 May 2010 12:36:39 -0600
Subject: [PATCH] win32 i386 build should use mingw64 if available

---
 makefile | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index f0dcab31a5..0451a7724c 100644
--- a/makefile
+++ b/makefile
@@ -193,12 +193,21 @@ ifeq ($(platform),windows)
 	cflags = -I$(inc) $(common-cflags)
 
 	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
-		cxx = i586-mingw32msvc-g++
-		cc = i586-mingw32msvc-gcc
-		dlltool = i586-mingw32msvc-dlltool
-		ar = i586-mingw32msvc-ar
-		ranlib = i586-mingw32msvc-ranlib
-		strip = i586-mingw32msvc-strip
+		ifeq (,$(shell which x86_64-w64-mingw32-g++))
+			cxx = i586-mingw32msvc-g++
+			cc = i586-mingw32msvc-gcc
+			dlltool = i586-mingw32msvc-dlltool
+			ar = i586-mingw32msvc-ar
+			ranlib = i586-mingw32msvc-ranlib
+			strip = i586-mingw32msvc-strip
+		else
+			cxx = x86_64-w64-mingw32-g++ $(mflag)
+			cc = x86_64-w64-mingw32-gcc $(mflag)
+			dlltool = x86_64-w64-mingw32-dlltool -mi386 --as-flags=--32
+			ar = x86_64-w64-mingw32-ar
+			ranlib = x86_64-w64-mingw32-ranlib
+			strip = x86_64-w64-mingw32-strip
+		endif
 	else
 		common-cflags += "-I$(JAVA_HOME)/include/win32"
 		build-cflags = $(common-cflags) -I$(src) -mthreads