Index: cross-make-mingw.sh
===================================================================
--- cross-make-mingw.sh	(revision 2086)
+++ cross-make-mingw.sh	(working copy)
@@ -1,15 +1,30 @@
 #!/bin/sh
 
-if [ !$CC ]
-then
-  export CC=i586-mingw32msvc-gcc
+CMD_PREFIX="i586-mingw32msvc i686-w64-mingw32";
+
+if [ "X$CC" = "X" ]; then
+    for check in $CMD_PREFIX; do
+        full_check="${check}-gcc"
+	if [ ! $(which "$full_check") = "" ]; then
+	    export CC="$full_check"
+	fi
+    done
 fi
 
-if [ !$WINDRES ]
-then
-  export WINDRES=i586-mingw32msvc-windres
+if [ "X$WINDRES" = "X" ]; then
+    for check in $CMD_PREFIX; do
+        full_check="${check}-windres"
+	if [ ! $(which "$full_check") = "" ]; then
+	    export WINDRES="$full_check"
+	fi
+    done
 fi
 
+if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then
+    echo "Error: Must define or find WINDRES and CC"
+    exit 1
+fi
+
 export PLATFORM=mingw32
 export ARCH=x86
 
Index: cross-make-mingw64.sh
===================================================================
--- cross-make-mingw64.sh	(revision 2086)
+++ cross-make-mingw64.sh	(working copy)
@@ -1,15 +1,30 @@
 #!/bin/sh
 
-if [ !$CC ]
-then
-  export CC=amd64-mingw32msvc-gcc
+CMD_PREFIX="amd64-mingw32msvc x86_64-w64-mingw32";
+
+if [ "X$CC" = "X" ]; then
+    for check in $CMD_PREFIX; do
+        full_check="${check}-gcc"
+	if [ ! $(which "$full_check") = "" ]; then
+	    export CC="$full_check"
+	fi
+    done
 fi
 
-if [ !$WINDRES ]
-then
-  export WINDRES=amd64-mingw32msvc-windres
+if [ "X$WINDRES" = "X" ]; then
+    for check in $CMD_PREFIX; do
+        full_check="${check}-windres"
+	if [ ! $(which "$full_check") = "" ]; then
+	    export WINDRES="$full_check"
+	fi
+    done
 fi
 
+if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then
+    echo "Error: Must define or find WINDRES and CC"
+    exit 1
+fi
+
 export PLATFORM=mingw32
 export ARCH=x64