diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-13 21:28:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-13 21:28:28 +0000 |
| commit | 1b1a1e6a3e4131ea0fd47b2bc6b05ddecaf9910a (patch) | |
| tree | 601fe839759501d74b6579751767ffb707ff324a /Makefile.nmake | |
| parent | 353823a2df6ebe9a9a9656c923aa5cc637932361 (diff) | |
| download | wireshark-1b1a1e6a3e4131ea0fd47b2bc6b05ddecaf9910a.tar.gz | |
Remove our local copy of WinPcap and download it from
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.
svn path=/trunk/; revision=44888
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 305664b94d..d08de675a1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -856,6 +856,8 @@ setup: verify_tools clean_setup process_libs # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ + . WinPcap_$(PCAP_VERSION).exe !IFDEF GTK_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ "$(GTK_NAME)" gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip |