From f28251ef2b768bf8e0d78f9aaa717d64b01edadf Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Fri, 10 Dec 2010 15:47:36 +0000
Subject: Fix manifest-generation for 64-bit gcc (mingw-w64)

---
 ChangeLog     | 5 +++++
 win/configure | 7 +++++--
 win/tcl.m4    | 7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24c8794..6a3a0ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-10  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tcl.m4:               Fix manifest-generation for 64-bit gcc (mingw-w64)
+	* win/configure:            (autoconf-2.59)
+
 2010-12-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tkSelect.c:     [Bug 3129527]: Fix buffer overflow w/ GCC 4.5 and
diff --git a/win/configure b/win/configure
index 922c8b9..e5b5ef7 100755
--- a/win/configure
+++ b/win/configure
@@ -3558,8 +3558,11 @@ echo "$as_me: error: ${CC} does not support the -shared option.
 	LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
 	LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
 
-	# gcc under Windows supports only 32bit builds
-	MACHINE="X86"
+	if test "$do64bit" != "no" ; then
+	    MACHINE="AMD64"
+	else
+	    MACHINE="X86"
+	fi
     else
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
diff --git a/win/tcl.m4 b/win/tcl.m4
index c24171c..601f3e2 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -575,8 +575,11 @@ file for information about building with Mingw.])
 	LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
 	LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
 
-	# gcc under Windows supports only 32bit builds
-	MACHINE="X86"
+	if test "$do64bit" != "no" ; then
+	    MACHINE="AMD64"
+	else
+	    MACHINE="X86"
+	fi
     else
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
-- 
cgit v0.12