Drop our requirement for MSVCR71.DLL.

svn path=/trunk/; revision=31578

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

config.nmake

@@ -263,7 +263,7 @@ GNUTLS_PKG=2.8.5-4.12
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-final
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -1005,9 +1005,9 @@ ADNS_CONFIG=
 !ENDIF # C_ARES
 
 !IFDEF KFW_DIR
-KFW_PATH=$(KFW_DIR)\bin\$(CPU)
-KFW_CFLAGS=/I$(KFW_DIR)\inc\krb5
-KFW_LIBS=$(KFW_DIR)\lib\$(CPU)\krb5_32.lib
+KFW_PATH=$(KFW_DIR)\bin
+KFW_CFLAGS=/I$(KFW_DIR)\include
+KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
 # Nmake uses carets to escape special characters
 KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
 !else

tools/win32-setup.sh

@@ -4,7 +4,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2009-12-22"
+export DOWNLOAD_TAG="2010-01-19"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`