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 /Makefile.nmake | |
| parent | 7da74dff21d1e41b02cf057fe0fe4c3ea6e9d88d (diff) | |
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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index de21cb4bc8..3cad4438f6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1054,7 +1054,7 @@ process_libs: !ENDIF !IFDEF ZLIB_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . zlib128.zip \ + . zlib-1.2.8-ws.zip \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !ENDIF !IFDEF LUA_DIR @@ -1173,6 +1173,7 @@ clean_setup: rm -r -f zlib125 rm -r -f zlib-1.2.5 rm -r -f zlib-1.2.8 + rm -r -f zlib-1.2.8-ws rm -r -f zlib123-dll rm -r -f AirPcap_Devpack_1_0_0_594 rm -r -f AirPcap_Devpack_4_0_0_1480 |