aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2003-12-01 17:17:51 +0000
committerGerald Combs <gerald@wireshark.org>2003-12-01 17:17:51 +0000
commit7569aef3df8c40f8bb45c32423b84e5ed20fab99 (patch)
tree832c8df66e0e7c0a04fdcdc7ee08ee5075a99b0f /config.nmake
parentda672d6f179dea9bfdf0cff9f9465f81b9770924 (diff)
Switch to the new (and official) zlib DLL from www.gzip.org.
svn path=/trunk/; revision=9127
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake
index 4d17690d96..36d1ab97be 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.64 2003/11/15 11:39:57 ulfl Exp $
+# $Id: config.nmake,v 1.65 2003/12/01 17:17:51 gerald Exp $
VERSION=0.9.16
#
@@ -54,7 +54,7 @@ GTK_DIR=C:\ethereal-win32-libs\gtk+
# If you don't have Zlib, comment this line out, so that Zlib isn't
# defined.
#
-ZLIB_DIR=C:\ethereal-win32-libs\zlib-114
+ZLIB_DIR=C:\ethereal-win32-libs\zlib121-dll
PCAP_DIR=C:\ethereal-win32-libs\WPdpack
NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6
@@ -147,8 +147,8 @@ WPCAP_CONSTIFIED=
!ENDIF
!IFDEF ZLIB_DIR
-ZLIB_CFLAGS=/I$(ZLIB_DIR)
-ZLIB_LIBS=$(ZLIB_DIR)\zlib.lib
+ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
+ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
# Nmake uses carets to escape special characters
ZLIB_CONFIG=^#define HAVE_LIBZ 1
!else