From 9552d163d82084e60883a8a67da0b09531ded524 Mon Sep 17 00:00:00 2001
From: gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Tue, 19 Jan 2010 22:58:12 +0000
Subject: Drop our requirement for MSVCR71.DLL.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31578 f5534014-38df-0310-8fa8-9805f1628bb7
---
 Makefile.nmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile.nmake')

diff --git a/Makefile.nmake b/Makefile.nmake
index 1ab04581ba..6891cf15fe 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -768,9 +768,9 @@ process_libs:
 !ENDIF
 !IFDEF KFW_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		. kfw-3-2-2-sdk.zip
-	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		. kfw-3-2-2.zip
+		. kfw-3-2-2-i386-ws-vc6.zip
+#	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+#		. kfw-3-2-2.zip
 !ENDIF
 !IFDEF PCAP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -858,6 +858,7 @@ clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
     rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
     rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-ws1
+    rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-i386-ws-vc6
     rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
     rm -r -f $(WIRESHARK_LIBS)/lua5.1
     rm -r -f $(WIRESHARK_LIBS)/lua5.1.4
-- 
cgit v1.2.3