diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-06 10:31:51 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-06 21:34:10 +0000 |
| commit | ec8ed1511a012b2801b4b68f13c97a06daccdf87 (patch) | |
| tree | fd0eb8cd478d9a65b961ceee37486e3210ac13c9 /config.nmake | |
| parent | 0ef2fd5d532b06cd6ae1ab2823b04b89f68bc253 (diff) | |
Use zlib 1.2.8 on Windows.
Change-Id: I3df88b1e891f43cd6b6ed089f6c3d20a942e68bc
Reviewed-on: https://code.wireshark.org/review/7952
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 60dc340651..5831ef3350 100644 --- a/config.nmake +++ b/config.nmake @@ -251,7 +251,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2014-10-01 +DOWNLOAD_TAG=2015-04-06 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -384,8 +384,7 @@ PCAP_REMOTE=1 # # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't # defined. -# EXperimental only use zlib 1.2.5 on win32 for now -ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 +ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8 # # Optional: the ADNS library enables asynchronous (nonblocking) DNS @@ -513,7 +512,7 @@ GEOIP_PKG=1.5.1-2 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2014-10-13 +DOWNLOAD_TAG=2015-04-06 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -637,7 +636,7 @@ PCAP_REMOTE=1 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't # defined. # -ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 +ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8 # # Optional: the ADNS library enables asynchronous (nonblocking) DNS @@ -1571,7 +1570,7 @@ PCAP_SETSAMPLING_CONFIG= !IFDEF ZLIB_DIR ZLIB_PATH=$(ZLIB_DIR) -ZLIB_CFLAGS=/I$(ZLIB_DIR)\include +ZLIB_CFLAGS=/I$(ZLIB_DIR) ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll # Nmake uses carets to escape special characters |