X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2FREADME;h=13f45fc46f1531782c3fee7ec5166c7d0bdf90b1;hp=e804a62ced1d775d365943003347d731983905e2;hb=2bebfdb844a9aa11b6db3e7d9ca93f8a4e6ca077;hpb=a4b95084e82c29e57b09a9ae4687aa4867a72e98

diff --git a/windows/README b/windows/README
index e804a62c..13f45fc4 100644
--- a/windows/README
+++ b/windows/README
@@ -1,38 +1,46 @@
                                                            -*- text -*-
 
-To build Wget with VC++ run configure.bat (in the main wget directory), 
-and then run nmake. At a certain point in time wget exposed some 
-compiler bugs in VC++ 5.0; VC++ 6.0 sp 5 is known to be safe. However 
-read the rest of this document before continuing.
-
-For VC++ the current default is to configure wget with ssl support; 
-first get openssl (http://www.openssl.org), compile it and install 
-relevant headers and libraries where your compiler can find them; 
-currently this could mean (presuming default installation directories) 
-copy (from the compiled openssl dirctory) the whole inc32/openssl 
-directory and its contents to 
-"C:\Program Files\Microsoft Visual Studio\VC98\Include\openssl",
-and from out32dll (in the openssl directory) the two needed libraries 
-(libeay32.lib and ssleay32.lib) to 
-"C:\Program Files\Microsoft Visual Studio\VC98\lib".
-These locations aren't exactly the best but will get you started if you 
-don't know where to place these headers and libraries.
-Usually at runtime some openssl libraries (currently ssleay32.dll and
-libeay32.dll) will need to be available in your environment PATH.
+You can configure the Windows port of Wget by running configure.bat (in
+the main Wget directory).  You can run it with no arguments to see the
+list of possible options.  Run it with the option corresponding to the
+compiler you intend to use to build Wget and follow the (brief)
+instructions printed on the screen.  The instructions bellow are for
+building Wget with Microsoft Visual C++ (MSVC); you may need to make
+appropriate substitutions for your compiler and build environment.
+
+To build Wget with MSVC run configure.bat (in the main Wget directory)
+with the argument --msvc, and then run nmake.  At a certain point in time
+Wget exposed some compiler bugs in MSVC 5.0; MSVC 6.0 SP5 is known to be
+safe.  However, read the rest of this document before continuing.
+
+For MSVC the current default is to build Wget with SSL support.  For this
+to work, you will need to have OpenSSL installed.  First, get OpenSSL
+(http://www.openssl.org), compile it and install the relevant headers and
+libraries where your compiler can find them; currently this could mean
+(presuming default installation directories for MSVC 6.0) copy (from the
+compiled OpenSSL directory) the whole inc32\openssl directory and its
+contents to "C:\Program Files\Microsoft Visual Studio\VC98\Include\openssl",
+and from out32dll (in the OpenSSL directory) the two needed libraries
+(libeay32.lib and ssleay32.lib) to
+"C:\Program Files\Microsoft Visual Studio\VC98\lib".  These locations
+aren't exactly the best but will get you started if you don't know where
+to place these headers and libraries.  Usually at run-time some OpenSSL
+libraries (currently ssleay32.dll and libeay32.dll) will need to be
+available in your environment PATH.
+
+If you don't want to/can't compile Wget with OpenSSL comment SSL related
+lines in windows\Makefile.src; then follow the normal instructions
+(configure.bat and so on).
 
 If you want to build the help file you will need a copy of makeinfo to
-convert wget.texi to rtf and html. I've made a copy available at
+convert wget.texi to rtf and html.  I've made a copy available at
 <URL:ftp://sunsite.dk/projects/wget/makeinfo.zip>.  This copy of
-makeinfo is from the miktxt 1.10 archive available from ctan. You also
-will need perl 5, one possibility is Activeperl (currently free) from
+makeinfo is from the miktxt 1.10 archive available from ctan.  You also
+will need perl 5, one possibility is ActivePerl (currently free) from
 <URL:http://www.activestate.com>; you need to locate the download and
 install instructions for the current version available (since the
 packages and installation instructions change from time to time).
 
-If you don't want/can't to compile wget with openssl comment the SSL 
-related lines in windows\Makefile.src; then follow the normal 
-instructions (configure.bat and so on).
-
 Windows contributors:
 
 * Darko Budor <dbudor@zesoi.fer.hr> -- the initial work on the Windows