Modernize README.woe32.

2 files changed, 48 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b07ae7..3d61c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Bruno Haible  <bruno@clisp.org>
+
+	Modernize README.woe32.
+	* README.woe32: Mention the mingw and Cygwin environments.
+
 2009-12-22  Eric Blake  <ebb9@byu.net>  (tiny change)
 
 	Avoid gcc warnings on Cygwin.
diff --git a/README.woe32 b/README.woe32
index 44fe4f2..06dda70 100644
--- a/README.woe32
+++ b/README.woe32
@@ -1,35 +1,58 @@
-Installation on Woe32 (WinNT/2000/XP, Win95/98/ME):
+Installation on Woe32 (WinNT/2000/XP/Vista/7, Win95/98/ME):
 
-- Requires MS Visual C/C++ 4.0 or 5.0 or 6.0 or 7.0.
+There are three ways to create binaries of this package for Woe32:
 
-  Note that binaries created with MSVC 7.0 should not be distributed: They
-  depend on a closed-source library 'msvcr70.dll' which is not normally part
-  of a Woe32 installation. You cannot distribute 'msvcr70.dll' with the
-  binaries - this would be a violation of the GPL and of the Microsoft EULA.
-  You can distribute the binaries without including 'msvcr70.dll', but this
-  will cause problems for users that don't have this library on their system.
-  Therefore it is not recommended. This problem does not occur with MSVC 6.0
-  and earlier.
+1) Native binaries, built using the mingw tool chain.
 
-- Cannot build in a separate directory.
+   I recommend to use the cygwin environment as the development environment
+   and mingw only as the target (runtime, deployment) environment.
+   For this, you need to install
+     - cygwin,
+     - the mingw runtime package, also from the cygwin site.
 
-- Build instructions:
+   Building for mingw is achieved through the following preparation
+   and configure commands:
 
-   Make sure that the MSVC4.0 or MSVC5.0 or MSVC6.0 or MSVC7.0 utilities
-   ("cl" etc.) are found in PATH. In a typical MSVC6.0 installation, this
-   can be achieved by running
+      PATH=/usr/local/mingw/bin:$PATH
+      export PATH
+      ./configure --host=i586-pc-mingw32 --prefix=/usr/local/mingw \
+        CC="gcc-3 -mno-cygwin" \
+        CXX="g++-3 -mno-cygwin"
+
+2) Native binaries, built using the MS Visual C/C++ tool chain.
+
+   - Requires MS Visual C/C++ 4.0 or 5.0 or 6.0 or 7.0.
+
+     Note that binaries created with MSVC 7.0 should not be distributed: They
+     depend on a closed-source library 'msvcr70.dll' which is not normally part
+     of a Woe32 installation. You cannot distribute 'msvcr70.dll' with the
+     binaries - this would be a violation of the GPL and of the Microsoft EULA.
+     You can distribute the binaries without including 'msvcr70.dll', but this
+     will cause problems for users that don't have this library on their system.
+     Therefore it is not recommended. This problem does not occur with MSVC 6.0
+     and earlier.
+
+   - Cannot build in a separate directory.
+
+   - Build instructions:
+
+      Make sure that the MSVC4.0 or MSVC5.0 or MSVC6.0 or MSVC7.0 utilities
+      ("cl" etc.) are found in PATH. In a typical MSVC6.0 installation, this
+      can be achieved by running
         C:\Program Files\Microsoft Visual Studio\VC98\bin\vcvars32.bat
-   In a typical MSVC7.0 installation, it can be achieved by running
+      In a typical MSVC7.0 installation, it can be achieved by running
         C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\vsvars32.bat
-
         nmake -f Makefile.msvc
 
-- Installation:
+   - Installation:
 
-   Either:
+      Either:
 
         Copy gperf.exe to your program repository.
 
-   Or:
+      Or:
 
         nmake -f Makefile.msvc install prefix=InstallBaseDirectory
+
+3) Binaries for the Cygwin environment. For these, please see the normal 
+   INSTALL file.