aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSapien2 <malov.anton@gmail.com>2012-10-25 14:24:41 +0400
committerMarc Hoersken <info@marc-hoersken.de>2012-11-01 22:06:53 +0100
commit0cb5650386990a6330375a21bad3dee17c162693 (patch)
tree4460d7562ce2385668c34c72be032f5b3a3a725c
parent8f61e5cea74cdeb7564bf2ac3ca7411200a38af9 (diff)
Minor winbuild refactoring
-rw-r--r--winbuild/Makefile.vc1
-rw-r--r--winbuild/MakefileBuild.vc2
2 files changed, 1 insertions, 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