From: Sapien2 <malov.anton@gmail.com>
Date: Thu, 25 Oct 2012 10:24:41 +0000 (+0400)
Subject: Minor winbuild refactoring
X-Git-Tag: curl-7_28_1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb5650386990a6330375a21bad3dee17c162693;p=thirdparty%2Fcurl.git

Minor winbuild refactoring
---

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index fcffc7411a..53d3e7ff98 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -32,6 +32,7 @@ CFGSET=true
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)
 !MESSAGE   DEBUG=<yes or no>            - Debug builds
+!MESSAGE   MACHINE=<X86 or X64>         - Target architecture (default x86)
 !ERROR please choose a valid mode
 
 !ENDIF
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 9ba6291f77..9cbd35f982 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -112,12 +112,10 @@ SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
 
 !IF "$(WITH_ZLIB)"=="dll"
 ZLIB_LIBS   = zlib.lib
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ
 USE_ZLIB    = true
 ZLIB        = dll
 !ELSEIF "$(WITH_ZLIB)"=="static"
 ZLIB_LIBS   = zlib_a.lib
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ
 USE_ZLIB    = true
 ZLIB        = static
 !ENDIF