Add instructions for building the MinGW target in Cygwin, and

rearrange some of the other text for better readability.

diff --git a/CHANGES b/CHANGES
index bedf11efc321311642ed2145153fe57f88a73751..98b44d561c6a997bfcc3e798a10b5b6413de4852 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -445,7 +445,9 @@ TODO: bug: pad  x  with leading zeros if necessary
 
  Changes between 0.9.7a and 0.9.7b  [xx XXX 2003]
 
-  *) 
+  *) Target "mingw" now allows native Windows code to be generated in
+     the Cygwin environment as well as with the MinGW compiler.
+     [Ulf Moeller] 
 
  Changes between 0.9.7 and 0.9.7a  [19 Feb 2003]
 

diff --git a/INSTALL.W32 b/INSTALL.W32
index de09fcba4aa7c5e1a77a72a17d02f403d382760b..d4996560ddf1502aedf88255b9aaa17d3d40497e 100644 (file)
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -10,13 +10,20 @@
 \r
  You need Perl for Win32.  Unless you will build on Cygwin, you will need\r
  ActiveState Perl, available from http://www.activestate.com/ActivePerl.\r
- For Cygwin users, there's more info in the Cygwin section.\r
 \r
  and one of the following C compilers:\r
 \r
   * Visual C++\r
   * Borland C\r
-  * GNU C (MinGW or Cygwin)\r
+  * GNU C (Cygwin or MinGW)\r
+\r
+ If you are compiling from a tarball or a CVS snapshot then the Win32 files\r
+ may well be not up to date. This may mean that some "tweaking" is required to\r
+ get it all to work. See the trouble shooting section later on for if (when?)\r
+ it goes wrong.\r
+\r
+ Visual C++\r
+ ----------\r
 \r
  If you want to compile in the assembly language routines with Visual C++ then\r
  you will need an assembler. This is worth doing because it will result in\r
@@ -39,14 +46,6 @@
  http://www.kernel.org/pub/software/devel/nasm/binaries/win32/\r
  The NASM binary nasmw.exe needs to be installed anywhere on your PATH.\r
 \r
- If you are compiling from a tarball or a CVS snapshot then the Win32 files\r
- may well be not up to date. This may mean that some "tweaking" is required to\r
- get it all to work. See the trouble shooting section later on for if (when?)\r
- it goes wrong.\r
-\r
- Visual C++\r
- ----------\r
-\r
  Firstly you should run Configure:\r
 \r
  > perl Configure VC-WIN32\r
@@ -120,58 +119,35 @@
  * Run make:\r
    > make -f bcb.mak\r
 \r
- GNU C (MinGW)\r
- -------------\r
-\r
- * Compiler installation:\r
-\r
-   MinGW is available from http://www.mingw.org. Run the installer and\r
-   set the MinGW \bin directory to the PATH in "System Properties" or\r
-   autoexec.bat.\r
-\r
- * Compile OpenSSL:\r
-\r
-   > ms\mingw32\r
-\r
-   This will create the library and binaries in out. In case any problems\r
-   occur, try\r
-   > ms\mingw32 no-asm\r
-   instead.\r
-\r
-   libcrypto.a and libssl.a are the static libraries. To use the DLLs,\r
-   link with libeay32.a and libssl32.a instead.\r
-\r
-   See troubleshooting if you get error messages about functions not having\r
-   a number assigned.\r
-\r
- * You can now try the tests:\r
-\r
-   > cd out\r
-   > ..\ms\test\r
-\r
  GNU C (Cygwin)\r
  --------------\r
 \r
  Cygwin provides a bash shell and GNU tools environment running\r
  on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.\r
  Consequently, a make of OpenSSL with Cygwin is closer to a GNU\r
- bash environment such as Linux than to other W32 makes which are\r
- based on a single makefile approach. Cygwin implements Posix/Unix\r
- calls through cygwin1.dll, and is contrasted to MingW which links\r
- dynamically to msvcrt.dll or crtdll.dll.\r
+ bash environment such as Linux than to other the other Win32\r
+ makes.\r
+\r
+ Cygwin implements a Posix/Unix runtime system (cygwin1.dll).\r
+ It is also possible to create Win32 binaries that only use the\r
+ Microsoft C runtime system (msvcrt.dll or crtdll.dll) using\r
+ MinGW. MinGW can be used in the Cygwin development environment\r
+ or in a standalone setup as described in the following section.\r
 \r
  To build OpenSSL using Cygwin:\r
 \r
  * Install Cygwin (see http://cygwin.com/)\r
 \r
- * Install Perl and ensure it is in the path (recent Cygwin perl \r
-   (version 5.6.1-2 of the latter has been reported to work) or\r
-   ActivePerl)\r
+ * Install Perl and ensure it is in the path. Both Cygwin perl\r
+   (5.6.1-2 or newer) and ActivePerl work.\r
 \r
  * Run the Cygwin bash shell\r
 \r
  * $ tar zxvf openssl-x.x.x.tar.gz\r
    $ cd openssl-x.x.x\r
+\r
+   To build the Cygwin version of OpenSSL:\r
+\r
    $ ./config\r
    [...]\r
    $ make\r
@@ -179,7 +155,16 @@
    $ make test\r
    $ make install\r
 \r
- This will create a default install in /usr/local/ssl.\r
+   This will create a default install in /usr/local/ssl.\r
+\r
+   To build the MinGW version (native Windows) in Cygwin:\r
+\r
+   $ ./Configure mingw\r
+   [...]\r
+   $ make\r
+   [...]\r
+   $ make test\r
+   $ make install\r
 \r
  Cygwin Notes:\r
 \r
@@ -192,6 +177,35 @@
  non-fatal error in "make test" but is otherwise harmless.  If\r
  desired and needed, GNU bc can be built with Cygwin without change.\r
 \r
+ GNU C (MinGW)\r
+ -------------\r
+\r
+ * Compiler installation:\r
+\r
+   MinGW is available from http://www.mingw.org. Run the installer and\r
+   set the MinGW bin directory to the PATH in "System Properties" or\r
+   autoexec.bat.\r
+\r
+ * Compile OpenSSL:\r
+\r
+   > ms\mingw32\r
+\r
+   This will create the library and binaries in out. In case any problems\r
+   occur, try\r
+   > ms\mingw32 no-asm\r
+   instead.\r
+\r
+   libcrypto.a and libssl.a are the static libraries. To use the DLLs,\r
+   link with libeay32.a and libssl32.a instead.\r
+\r
+   See troubleshooting if you get error messages about functions not having\r
+   a number assigned.\r
+\r
+ * You can now try the tests:\r
+\r
+   > cd out\r
+   > ..\ms\test\r
+\r
 \r
  Installation\r
  ------------\r