From e78a1582dc13d770bf1a9de64ff817369c741ef5 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Tue, 25 Oct 2011 12:31:54 +0200
Subject: Make Win64 build work both under MSYS and Cygwin

---
 lib/wx/aclocal.m4   | 2 +-
 lib/wx/configure.in | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/wx')

diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4
index 34237fcb43..339a15a2bb 100644
--- a/lib/wx/aclocal.m4
+++ b/lib/wx/aclocal.m4
@@ -132,7 +132,7 @@ if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then
 		AC_MSG_RESULT([Cygwin and VC])
 		MIXED_CYGWIN_VC=yes
 		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
-	elif test -x /usr/bin/i686-pc-msys-gcc.exe; then
+	elif test -x /usr/bin/msysinfo; then
 	        CFLAGS="-O2"
 		MIXED_MSYS=yes
 		AC_MSG_RESULT([MSYS and VC])
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index a2e41b540e..e00d5cba98 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -398,6 +398,15 @@ else
     CWXWIN3=$CWXWIN_PROG/wxWidgets-2.8
     CWXWIN4=$CWXWIN_PROG/wxMSW-2.8
     CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.8.* /opt/local/pgm/wxWidgets-2.8.*"
+    case $ac_cv_sizeof_void_p in
+    	 8)
+		CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.8.* /opt/local64/pgm/wxWidgets-2.8.* $CWX_DOCUMENTED"
+		;;
+         *)
+		true
+		;;
+    esac	
+			
     CWXPATH="$CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*"
 
     for dir in $CWXPATH; do
-- 
cgit v1.2.3