From 1b1a1e6a3e4131ea0fd47b2bc6b05ddecaf9910a Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 13 Sep 2012 21:28:28 +0000
Subject: 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
---
 Makefile.nmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.nmake')

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
-- 
cgit v1.2.3