diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-11-07 23:27:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-11-07 23:27:13 +0000 |
| commit | 4192ad97702962b1596614222cdc95e0ead8af2c (patch) | |
| tree | 31467b8662686eb7c79f6e06a684e15bd58a0fcc /config.nmake | |
| parent | ed66a067f5500d9d4bce1d9210799ba898bd5a19 (diff) | |
Let people configure whether to build with Zlib or not solely by
controlling whether ZLIB_DIR is defined or not in config.nmake.
svn path=/trunk/; revision=8911
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 737a842c52..3de34e518a 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.61 2003/11/02 23:36:01 gerald Exp $ +# $Id: config.nmake,v 1.62 2003/11/07 23:27:08 guy Exp $ VERSION=0.9.16 # @@ -36,7 +36,15 @@ GLIB_VERSION=2.0 GLIB_DIR=C:\ethereal-win32-libs\glib GTK_DIR=C:\ethereal-win32-libs\gtk+ +# +# If you have Zlib, set this to the pathname of the directory in +# which the Zlib headers and .lib file are stored. +# +# If you don't have Zlib, comment this line out, so that Zlib isn't +# defined. +# ZLIB_DIR=C:\ethereal-win32-libs\zlib-114 + PCAP_DIR=C:\ethereal-win32-libs\WPdpack NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6 @@ -141,6 +149,17 @@ PCAP_FINDALLDEVS_CONFIG= WPCAP_CONSTIFIED= !ENDIF +!IFDEF ZLIB_DIR +ZLIB_CFLAGS=/I$(ZLIB_DIR) +ZLIB_LIBS=$(ZLIB_DIR)\zlib.lib +# Nmake uses carets to escape special characters +ZLIB_CONFIG=^#define HAVE_LIBZ 1 +!else +ZLIB_CFLAGS= +ZLIB_LIBS= +ZLIB_CONFIG= +!ENDIF + !IFDEF ADNS_DIR ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib |