diff options
| author | Michael Mann <mmann78@netscape.net> | 2012-12-13 19:59:57 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2012-12-13 19:59:57 +0000 |
| commit | a37f60e4f6c6210098fc688a038c81d585be4eb8 (patch) | |
| tree | a101cf8b1195115cae09719428f8fef5d9b31e49 /Makefile.nmake | |
| parent | 5a8c275b26a2e997bb3781b3c474d25d7afda202 (diff) | |
| download | wireshark-a37f60e4f6c6210098fc688a038c81d585be4eb8.tar.gz | |
Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows
svn path=/trunk/; revision=46530
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 024eb136b3..33c22cad5a 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -79,6 +79,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ $(PYTHON_LIBS) \ + $(ZLIB_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -88,8 +89,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ - $(ZLIB_LIBS) + $(ADNS_LIBS) !ENDIF tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ |