Base code merged to SPIN 2.4

[platform/upstream/curl.git] / winbuild / BUILD.WINDOWS.txt

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 2485078..7d6b364 100644 (file)
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -1,19 +1,25 @@
 Building with Visual C++, prerequises\r
 =====================================\r
+\r
    This document describes how to compile, build and install curl and libcurl\r
    from sources using the Visual C++ build tool. To build with VC++, you will\r
    of course have to first install VC++. The minimum required version of\r
-   VC is 6 (part of Visual Studio 6). However using a more recent version like\r
-   2008 (vc9) is strongly recommended.\r
+   VC is 6 (part of Visual Studio 6). However using a more recent version is\r
+   strongly recommended.\r
 \r
    VC++ is also part of the Windows Platform SDK. You do not have to install\r
    the full Visual Studio or Visual C++ if all you want is to build curl.\r
 \r
-   The Platform SDK can be fetched here, freely:\r
+   The latest Platform SDK can be downloaded freely from:\r
 \r
     http://msdn.microsoft.com/en-us/windows/bb980924\r
 \r
-   If you wish to support zlib, openssl, ssh2, you will have to download\r
+   If you are building with VC6 then you will also need the February 2003\r
+   Edition of the Platform SDK which can be downloaded from:\r
+\r
+    http://www.microsoft.com/en-us/download/details.aspx?id=12261\r
+\r
+   If you wish to support zlib, openssl, c-ares, ssh2, you will have to download\r
    them separately and copy them to the deps directory as shown below:\r
    \r
    somedirectory\\r
@@ -52,12 +58,13 @@ a directory named using the options given to the nmake call.
 nmake /f Makefile.vc mode=<static or dll> <options>\r
 \r
 where <options> is one or many of:\r
-  VC=<6,7,8,9,10>              - VC versions\r
+  VC=<6,7,8,9,10,11,12>        - VC versions\r
   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
                                  Defaults to sibbling directory deps: ../deps\r
-                                 Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/\r
+                                 Libraries can be fetched at http://windows.php.net/downloads/php-sdk/deps/\r
                                  Uncompress them into the deps folder.\r
   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static\r
+  WITH_CARES=<dll or static>   - Enable c-ares support, DLL or static\r
   WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static\r
   WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static\r
   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes\r
@@ -68,4 +75,4 @@ where <options> is one or many of:
   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
   DEBUG=<yes or no>            - Debug builds\r
-  MACHINE=<X86 or X64>         - Target architecture (default is X86)
\ No newline at end of file
+  MACHINE=<x86 or x64>         - Target architecture (default is x86)\r