diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-13 02:03:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-13 02:03:14 +0000 |
| commit | 1ca41683a0841c65778d878b2015b0182fe3e722 (patch) | |
| tree | cd851a0f636fa372731b6686b4fec912fbd729cd /Makefile.nmake | |
| parent | 75acdcbba05602c017e25841ab429ea299b41d5c (diff) | |
Now that Ethereal *itself* (not just Wiretap) can use libz (the Soulseek
dissector can use it), we have to link Ethereal, Tethereal, and dftest
with libz, as well as linking Wiretap with it.
We also probably need to link dftest with the PCRE library, as the
display filter code uses PCRE.
svn path=/trunk/; revision=10057
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 3131694569..adfffd857b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.403 2004/02/11 09:58:13 guy Exp $ +# $Id: Makefile.nmake,v 1.404 2004/02/13 02:03:14 guy Exp $ include config.nmake include <win32.mak> @@ -109,6 +109,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ + $(ZLIB_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib # $(PCAP_DIR)\lib\wpcap.lib @@ -119,6 +120,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ + $(ZLIB_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -133,7 +135,9 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ wiretap\wiretap-$(WTAP_VERSION).lib \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(PCRE_LIBS) \ + $(ZLIB_LIBS) randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ user32.lib \ |