From 7569aef3df8c40f8bb45c32423b84e5ed20fab99 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 1 Dec 2003 17:17:51 +0000
Subject: Switch to the new (and official) zlib DLL from www.gzip.org.

svn path=/trunk/; revision=9127
---
 config.nmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config.nmake')

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
-- 
cgit v1.2.3