From 0cb5650386990a6330375a21bad3dee17c162693 Mon Sep 17 00:00:00 2001
From: Sapien2 <malov.anton@gmail.com>
Date: Thu, 25 Oct 2012 14:24:41 +0400
Subject: Minor winbuild refactoring

---
 winbuild/Makefile.vc      | 1 +
 winbuild/MakefileBuild.vc | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index fcffc7411..53d3e7ff9 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 9ba6291f7..9cbd35f98 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
-- 
cgit v1.2.3