summaryrefslogtreecommitdiff
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-06-10 01:30:49 +0000
committerGerald Combs <gerald@wireshark.org>2009-06-10 01:30:49 +0000
commit1d0ae8dadbe8092b5b2cbb1e94ef992d628cd270 (patch)
tree021a8b654a4033d4346b016d9c056a1ecb6bcd31 /Makefile.nmake
parentcdae660d2ae079619211bc8249952b6c8e913208 (diff)
downloadwireshark-1d0ae8dadbe8092b5b2cbb1e94ef992d628cd270.tar.gz
Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 7460c553fd..0d1e12ac6a 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -779,7 +779,7 @@ process_libs:
!ENDIF
!IFDEF KFW_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- . kfw-2.6.5-ws1.zip
+ . kfw-3.2.2-ws1.zip
!ENDIF
!IFDEF PCAP_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -898,7 +898,7 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/gtk+
rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
- rm -r -f $(WIRESHARK_LIBS)/kfw-2.6.5-ws1
+ rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-ws1
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
@@ -1083,6 +1083,7 @@ install-all: install-generated-files
!IFDEF KFW_DIR
xcopy $(KFW_DIR)\bin\comerr32.dll $(INSTALL_DIR) /d
xcopy $(KFW_DIR)\bin\krb5_32.dll $(INSTALL_DIR) /d
+ xcopy $(KFW_DIR)\bin\k5sprt32.dll $(INSTALL_DIR) /d
!ENDIF
!IFDEF GNUTLS_DIR
xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d