Add instructions for building the MinGW target in Cygwin, and

rearrange some of the other text for better readability.

1 files changed, 61 insertions, 47 deletions

diff --git a/INSTALL.W32 b/INSTALL.W32
index de09fcba4a..d4996560dd 100644
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -10,13 +10,20 @@
 

  You need Perl for Win32.  Unless you will build on Cygwin, you will need

  ActiveState Perl, available from http://www.activestate.com/ActivePerl.

- For Cygwin users, there's more info in the Cygwin section.

 

  and one of the following C compilers:

 

   * Visual C++

   * Borland C

-  * GNU C (MinGW or Cygwin)

+  * GNU C (Cygwin or MinGW)

+

+ If you are compiling from a tarball or a CVS snapshot then the Win32 files

+ may well be not up to date. This may mean that some "tweaking" is required to

+ get it all to work. See the trouble shooting section later on for if (when?)

+ it goes wrong.

+

+ Visual C++

+ ----------

 

  If you want to compile in the assembly language routines with Visual C++ then

  you will need an assembler. This is worth doing because it will result in

@@ -39,14 +46,6 @@
  http://www.kernel.org/pub/software/devel/nasm/binaries/win32/

  The NASM binary nasmw.exe needs to be installed anywhere on your PATH.

 

- If you are compiling from a tarball or a CVS snapshot then the Win32 files

- may well be not up to date. This may mean that some "tweaking" is required to

- get it all to work. See the trouble shooting section later on for if (when?)

- it goes wrong.

-

- Visual C++

- ----------

-

  Firstly you should run Configure:

 

  > perl Configure VC-WIN32

@@ -120,58 +119,35 @@
  * Run make:

    > make -f bcb.mak

 

- GNU C (MinGW)

- -------------

-

- * Compiler installation:

-

-   MinGW is available from http://www.mingw.org. Run the installer and

-   set the MinGW \bin directory to the PATH in "System Properties" or

-   autoexec.bat.

-

- * Compile OpenSSL:

-

-   > ms\mingw32

-

-   This will create the library and binaries in out. In case any problems

-   occur, try

-   > ms\mingw32 no-asm

-   instead.

-

-   libcrypto.a and libssl.a are the static libraries. To use the DLLs,

-   link with libeay32.a and libssl32.a instead.

-

-   See troubleshooting if you get error messages about functions not having

-   a number assigned.

-

- * You can now try the tests:

-

-   > cd out

-   > ..\ms\test

-

  GNU C (Cygwin)

  --------------

 

  Cygwin provides a bash shell and GNU tools environment running

  on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.

  Consequently, a make of OpenSSL with Cygwin is closer to a GNU

- bash environment such as Linux than to other W32 makes which are

- based on a single makefile approach. Cygwin implements Posix/Unix

- calls through cygwin1.dll, and is contrasted to MingW which links

- dynamically to msvcrt.dll or crtdll.dll.

+ bash environment such as Linux than to other the other Win32

+ makes.

+

+ Cygwin implements a Posix/Unix runtime system (cygwin1.dll).

+ It is also possible to create Win32 binaries that only use the

+ Microsoft C runtime system (msvcrt.dll or crtdll.dll) using

+ MinGW. MinGW can be used in the Cygwin development environment

+ or in a standalone setup as described in the following section.

 

  To build OpenSSL using Cygwin:

 

  * Install Cygwin (see http://cygwin.com/)

 

- * Install Perl and ensure it is in the path (recent Cygwin perl 

-   (version 5.6.1-2 of the latter has been reported to work) or

-   ActivePerl)

+ * Install Perl and ensure it is in the path. Both Cygwin perl

+   (5.6.1-2 or newer) and ActivePerl work.

 

  * Run the Cygwin bash shell

 

  * $ tar zxvf openssl-x.x.x.tar.gz

    $ cd openssl-x.x.x

+

+   To build the Cygwin version of OpenSSL:

+

    $ ./config

    [...]

    $ make

@@ -179,7 +155,16 @@
    $ make test

    $ make install

 

- This will create a default install in /usr/local/ssl.

+   This will create a default install in /usr/local/ssl.

+

+   To build the MinGW version (native Windows) in Cygwin:

+

+   $ ./Configure mingw

+   [...]

+   $ make

+   [...]

+   $ make test

+   $ make install

 

  Cygwin Notes:

 

@@ -192,6 +177,35 @@
  non-fatal error in "make test" but is otherwise harmless.  If

  desired and needed, GNU bc can be built with Cygwin without change.

 

+ GNU C (MinGW)

+ -------------

+

+ * Compiler installation:

+

+   MinGW is available from http://www.mingw.org. Run the installer and

+   set the MinGW bin directory to the PATH in "System Properties" or

+   autoexec.bat.

+

+ * Compile OpenSSL:

+

+   > ms\mingw32

+

+   This will create the library and binaries in out. In case any problems

+   occur, try

+   > ms\mingw32 no-asm

+   instead.

+

+   libcrypto.a and libssl.a are the static libraries. To use the DLLs,

+   link with libeay32.a and libssl32.a instead.

+

+   See troubleshooting if you get error messages about functions not having

+   a number assigned.

+

+ * You can now try the tests:

+

+   > cd out

+   > ..\ms\test

+

 

  Installation

  ------------