Minor winbuild refactoring

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index fcffc7411ad5ae9d4b3d27bb96b27ae5302e3e8a..53d3e7ff984f7d68748424c233c48cfdf0aa1ffd 100644 (file)
--- 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\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
+!MESSAGE   MACHINE=<X86 or X64>         - Target architecture (default x86)
 !ERROR please choose a valid mode\r
 \r
 !ENDIF\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 9ba6291f77b6a0c878e59f9890cd795c8f326207..9cbd35f98237f8f180f8e365bfae2c17a7fed2df 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -112,12 +112,10 @@ SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
 \r
 !IF "$(WITH_ZLIB)"=="dll"\r
 ZLIB_LIBS   = zlib.lib\r
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ\r
 USE_ZLIB    = true\r
 ZLIB        = dll\r
 !ELSEIF "$(WITH_ZLIB)"=="static"\r
 ZLIB_LIBS   = zlib_a.lib\r
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ\r
 USE_ZLIB    = true\r
 ZLIB        = static\r
 !ENDIF\r