From 686f1ba983f43293720370e4763e2f696fad40be Mon Sep 17 00:00:00 2001
From: Matt Klich <matt.klich@readytalk.com>
Date: Wed, 9 Jun 2010 16:03:48 -0600
Subject: [PATCH] Revert "win32 i386 build should use mingw64 if available"

This reverts commit 74e282a3d3af94e7f0c3c3b18f4740f849d7f618.
---
 makefile | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/makefile b/makefile
index 0451a7724c..f0dcab31a5 100644
--- a/makefile
+++ b/makefile
@@ -193,21 +193,12 @@ ifeq ($(platform),windows)
 	cflags = -I$(inc) $(common-cflags)
 
 	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
-		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
+		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
 		common-cflags += "-I$(JAVA_HOME)/include/win32"
 		build-cflags = $(common-cflags) -I$(src) -mthreads