From d7c9f2f63ae3da81aeb66b546d4daedd860776cb Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sun, 8 Jul 2012 10:41:53 +0200 Subject: winbuild: Aligned BUILD.WINDOWS.txt and Makefile.vc usage help --- winbuild/BUILD.WINDOWS.txt | 24 +++++++++++++----------- winbuild/Makefile.vc | 21 +++++++++++---------- 2 files changed, 24 insertions(+), 21 deletions(-) (limited to 'winbuild') diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt index 7d68110bd..53030cb95 100644 --- a/winbuild/BUILD.WINDOWS.txt +++ b/winbuild/BUILD.WINDOWS.txt @@ -45,24 +45,26 @@ Once you are in the console, go to the winbuild directory in the Curl sources: cd curl-src\winbuild -Then you can call nmake /f makefile with the desired options (see below). +Then you can call nmake /f Makefile.vc with the desired options (see below). The builds will be in the top src directory, builds\ directory, in a directory named using the options given to the nmake call. -nmake /f makefile.vc mode= +nmake /f Makefile.vc mode= + where is one or many of: VC=<6,7,8,9,10> - VC versions WITH_DEVEL= - Paths for the development files (SSL, zlib, etc.) - Default to sibbling directory deps: ../deps + Defaults to sibbling directory deps: ../deps Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ Uncompress them into the deps folder. WITH_SSL= - Enable OpenSSL support, DLL or static - WITH_ZLIB= - Enable ZLib support, DLL or static - WITH_SSH2= - Enable LIbSSH2 support, DLL or static - USE_SSSPI= - Enable SSPI support, default to yes - USE_IPV6= - Enable IPV6, default to yes + WITH_ZLIB= - Enable zlib support, DLL or static + WITH_SSH2= - Enable libSSH2 support, DLL or static + ENABLE_SSPI= - Enable SSPI support, defaults to yes + ENABLE_IPV6= - Enable IPv6, defaults to yes + ENABLE_IDN= - Enable use of Windows IDN APIs, defaults to yes + Requires Windows Vista or later, or installation from: + http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815 + ENABLE_WINSSL= - Enable native Windows SSL support, defaults to yes + GEN_PDB= - Generate Program Database (debug symbols for release build) DEBUG= - Debug builds - USE_IDN= - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later. - or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815 - GEN_PDB= - Generate Program Database (debug symbols release build) - diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index a75747877..be93381f4 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -13,22 +13,23 @@ CFGSET=true # Usage # -!MESSAGE Usage: nmake /f makefile.vc mode= +!MESSAGE Usage: nmake /f Makefile.vc mode= !MESSAGE where is one or many of: !MESSAGE VC=<6,7,8,9,10> - VC versions !MESSAGE WITH_DEVEL= - Paths for the development files (SSL, zlib, etc.) -!MESSAGE Default to sibbling directory deps: ../deps +!MESSAGE Defaults to sibbling directory deps: ../deps !MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ !MESSAGE Uncompress them into the deps folder. !MESSAGE WITH_SSL= - Enable OpenSSL support, DLL or static -!MESSAGE WITH_ZLIB= - Enable ZLib support, DLL or static -!MESSAGE WITH_SSH2= - Enable LIbSSH2 support, DLL or static -!MESSAGE ENABLE_SSPI= - Enable SSPI support, default to yes -!MESSAGE ENABLE_IPV6= - Enable IPV6, default to yes -!MESSAGE ENABLE_IDN= - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later. -!MESSAGE or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815 -!MESSAGE ENABLE_WINSSL= - Enable native Windows SSL support, default to yes -!MESSAGE GEN_PDB= - Generate Program Database (debug symbols release build) +!MESSAGE WITH_ZLIB= - Enable zlib support, DLL or static +!MESSAGE WITH_SSH2= - Enable libSSH2 support, DLL or static +!MESSAGE ENABLE_SSPI= - Enable SSPI support, defaults to yes +!MESSAGE ENABLE_IPV6= - Enable IPv6, defaults to yes +!MESSAGE ENABLE_IDN= - Enable use of Windows IDN APIs, defaults to yes +!MESSAGE Requires Windows Vista or later, or installation from: +!MESSAGE http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815 +!MESSAGE ENABLE_WINSSL= - Enable native Windows SSL support, defaults to yes +!MESSAGE GEN_PDB= - Generate Program Database (debug symbols for release build) !MESSAGE DEBUG= - Debug builds !ERROR please choose a valid mode -- cgit v1.2.3