merge 8.5

1 files changed, 37 insertions, 9 deletions

diff --git a/win/README b/win/README
index 1929362..1cb04f3 100644
--- a/win/README
+++ b/win/README
@@ -24,7 +24,28 @@ In order to compile Tcl for Windows, you need the following:
 
 	or
 
-	Msys + Mingw [http://www.mingw.org/download.shtml]
+	Linux + MinGW-w64 [http://mingw-w64.sourceforge.net/]
+	    (win32 or win64)
+
+	or
+
+	Cygwin + MinGW-w64 [http://cygwin.com/install.html]
+	    (win32 or win64)
+
+	or
+
+	Darwin + MinGW-w64 [http://mingw-w64.sourceforge.net/]
+	    (win32 or win64)
+
+	or
+
+	Msys + MinGW-w64 [http://mingw-w64.sourceforge.net/]
+	    (win32 or win64)
+
+	or
+
+	Msys + MinGW [http://www.mingw.org/download.shtml]
+	    (win32 only)
 
 
 In practice, this release is built with Visual C++ 6.0 and the TEA
@@ -40,19 +61,26 @@ using it, are in the comments of "makefile.vc".  A quick example would be:
 There is also a Developer Studio workspace and project file, too, if you
 would like to use them.
 
-If you are building with Msys, you can use the configure script that lives
-in the win subdirectory. The Msys based configure/build process works just
-like the UNIX one, so you will want to refer to ../unix/README for
-available configure options. An error will be generated by the configure
-script if you try to compile Tcl with the Cygwin version of gcc instead of
-the Mingw version. Check your PATH if you get this error.
+If you are building with Linux, Cygwin or Msys, you can use the configure
+script that lives in the win subdirectory. The Linux/Cygwin/Msys based
+configure/build process works just like the UNIX one, so you will want
+to refer to ../unix/README for available configure options.
+
+If you want 64-bit executables (x86_64), you need to configure using
+the --enable-64bit option. Make sure that the x86_64-w64-mingw32
+compiler is present. For Cygwin this compiler can be found in the
+"mingw64-x86_64-gcc-core" package, which can be installed through
+the normal Cygwin install process. If you only want 32-bit executables,
+the "mingw64-i686-gcc-core" package is what you need. For Linux, Darwin
+and Msys, you can download a suitable win32 or win64 compiler from
+[https://sourceforge.net/projects/mingw-w64/files/]
 
 Use the Makefile "install" target to install Tcl.  It will install it
 according to the prefix options you provided in the correct directory
 structure.
 
-Note that in order to run tclsh85.exe, you must ensure that tcl85.dll is on
-your path, in the system directory, or in the directory containing
+Note that in order to run tclsh85.exe, you must ensure that tcl85.dll is
+on your path, in the system directory, or in the directory containing
 tclsh85.exe.
 
 Note: Tcl no longer provides support for Win32s.