diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-05-16 22:26:53 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-05-31 18:15:06 +0000 |
| commit | 7780159c03276d0e35df30f69d9a4806958c764e (patch) | |
| tree | 4dcdef30a653e2538ec151b407f2b696b5735e5a /config.nmake | |
| parent | 7da74dff21d1e41b02cf057fe0fe4c3ea6e9d88d (diff) | |
| download | wireshark-7780159c03276d0e35df30f69d9a4806958c764e.tar.gz wireshark-7780159c03276d0e35df30f69d9a4806958c764e.tar.bz2 wireshark-7780159c03276d0e35df30f69d9a4806958c764e.zip | |
Fix zlib cmake
Add support for the locally modified version of zlib to suppress
a CMake warning and disable building of the zlib examples.
Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23
Reviewed-on: https://code.wireshark.org/review/8706
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 8b169bedc0..c52c201ba1 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=2015-04-06 +DOWNLOAD_TAG=2015-05-30 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -384,7 +384,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)\zlib-1.2.8 +ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # # Optional: the ADNS library enables asynchronous (nonblocking) DNS @@ -512,7 +512,7 @@ GEOIP_PKG=1.5.1-2 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2015-04-06 +DOWNLOAD_TAG=2015-05-30 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -636,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)\zlib-1.2.8 +ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # # Optional: the ADNS library enables asynchronous (nonblocking) DNS |