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 /tools/win-setup.ps1 | |
| parent | 7da74dff21d1e41b02cf057fe0fe4c3ea6e9d88d (diff) | |
| download | wireshark-7780159c03276d0e35df30f69d9a4806958c764e.tar.gz | |
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 'tools/win-setup.ps1')
| -rw-r--r-- | tools/win-setup.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 83d9a6c995..0e3f55a832 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,8 +101,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2015-04-06" -$Win32CurrentTag = "2015-04-06" +$Win64CurrentTag = "2015-05-30" +$Win32CurrentTag = "2015-05-30" # Archive file / subdir. $Win64Archives = @{ @@ -119,7 +119,7 @@ $Win64Archives = @{ "user-guide-g7ea0d6c.zip" = "user-guide"; "WinSparkle-0.3-44-g2c8d9d3-win64ws.zip" = ""; "WpdPack_4_1_2.zip" = ""; - "zlib128.zip" = ""; + "zlib-1.2.8-ws.zip" = ""; } $Win32Archives = @{ @@ -136,7 +136,7 @@ $Win32Archives = @{ "user-guide-g7ea0d6c.zip" = "user-guide"; "WinSparkle-0.3-44-g2c8d9d3-win32ws.zip" = ""; "WpdPack_4_1_2.zip" = ""; - "zlib128.zip" = ""; + "zlib-1.2.8-ws.zip" = ""; } # Lua |