Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

winbuild: Aligned BUILD.WINDOWS.txt and Makefile.vc usage help

  • Loading branch information...
commit d7c9f2f63ae3da81aeb66b546d4daedd860776cb 1 parent d39bbcf
Marc Hörsken authored July 08, 2012
24  winbuild/BUILD.WINDOWS.txt
@@ -45,24 +45,26 @@ Once you are in the console, go to the winbuild directory in the Curl
45 45
 sources:
46 46
     cd curl-src\winbuild
47 47
 
48  
-Then you can call nmake /f makefile with the desired options (see below).
  48
+Then you can call nmake /f Makefile.vc with the desired options (see below).
49 49
 The builds will be in the top src directory, builds\ directory, in 
50 50
 a directory named using the options given to the nmake call.
51 51
 
52  
-nmake /f makefile.vc mode=<static or dll> <options>
  52
+nmake /f Makefile.vc mode=<static or dll> <options>
  53
+
53 54
 where <options> is one or many of:
54 55
   VC=<6,7,8,9,10>              - VC versions
55 56
   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)
56  
-                                 Default to sibbling directory deps: ../deps
  57
+                                 Defaults to sibbling directory deps: ../deps
57 58
                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
58 59
                                  Uncompress them into the deps folder.
59 60
   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static
60  
-  WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static
61  
-  WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static
62  
-  USE_SSSPI=<yes or no>        - Enable SSPI support, default to yes
63  
-  USE_IPV6=<yes or no>         - Enable IPV6, default to yes
  61
+  WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static
  62
+  WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static
  63
+  ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes
  64
+  ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes
  65
+  ENABLE_IDN=<yes or no>       - Enable use of Windows IDN APIs, defaults to yes
  66
+                                 Requires Windows Vista or later, or installation from:
  67
+                                 http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
  68
+  ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes
  69
+  GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)
64 70
   DEBUG=<yes or no>            - Debug builds
65  
-  USE_IDN=<yes or no>          - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
66  
-                                 or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
67  
-  GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)
68  
-
21  winbuild/Makefile.vc
@@ -13,22 +13,23 @@ CFGSET=true
13 13
 # Usage
14 14
 #
15 15
 
16  
-!MESSAGE Usage: nmake /f makefile.vc mode=<static or dll> <options>
  16
+!MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options>
17 17
 !MESSAGE where <options> is one or many of:
18 18
 !MESSAGE   VC=<6,7,8,9,10>              - VC versions
19 19
 !MESSAGE   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)
20  
-!MESSAGE                                  Default to sibbling directory deps: ../deps
  20
+!MESSAGE                                  Defaults to sibbling directory deps: ../deps
21 21
 !MESSAGE                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
22 22
 !MESSAGE                                  Uncompress them into the deps folder.
23 23
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static
24  
-!MESSAGE   WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static
25  
-!MESSAGE   WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static
26  
-!MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, default to yes
27  
-!MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPV6, default to yes
28  
-!MESSAGE   ENABLE_IDN=<yes or no>       - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
29  
-!MESSAGE                                  or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
30  
-!MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, default to yes
31  
-!MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)
  24
+!MESSAGE   WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static
  25
+!MESSAGE   WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static
  26
+!MESSAGE   ENABLE_SSPI=<yes or no>      - Enable SSPI support, defaults to yes
  27
+!MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPv6, defaults to yes
  28
+!MESSAGE   ENABLE_IDN=<yes or no>       - Enable use of Windows IDN APIs, defaults to yes
  29
+!MESSAGE                                  Requires Windows Vista or later, or installation from:
  30
+!MESSAGE                                  http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
  31
+!MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes
  32
+!MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)
32 33
 !MESSAGE   DEBUG=<yes or no>            - Debug builds
33 34
 !ERROR please choose a valid mode
34 35
 

0 notes on commit d7c9f2f

Please sign in to comment.
Something went wrong with that request. Please try again.