diff options
| -rw-r--r-- | Makefile.nmake | 10 | ||||
| -rw-r--r-- | config.nmake | 8 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f92149ac1b..570e5fb26f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -744,7 +744,9 @@ process_libs: !ENDIF !IFDEF KFW_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . kfw-3.2.2-ws1.zip + . kfw-3-2-2-sdk.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)" \ @@ -1019,9 +1021,9 @@ install-all: install-generated-files xcopy $(PCRE_DIR)\man\cat3\pcrepattern.3.txt $(INSTALL_DIR) /d !ENDIF !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 + xcopy $(KFW_PATH)\comerr32.dll $(INSTALL_DIR) /d + xcopy $(KFW_PATH)\krb5_32.dll $(INSTALL_DIR) /d + xcopy $(KFW_PATH)\k5sprt32.dll $(INSTALL_DIR) /d !ENDIF !IFDEF GNUTLS_DIR xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d diff --git a/config.nmake b/config.nmake index 9f443cb5a0..f1c1ea7bda 100644 --- a/config.nmake +++ b/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-ws1 +KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-final # # Optional: the Nettle library enables ??? decryption. @@ -1005,9 +1005,9 @@ ADNS_CONFIG= !ENDIF # C_ARES !IFDEF KFW_DIR -KFW_PATH=$(KFW_DIR)\bin -KFW_CFLAGS=/I$(KFW_DIR)\include -KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib +KFW_PATH=$(KFW_DIR)\bin\$(CPU) +KFW_CFLAGS=/I$(KFW_DIR)\inc\krb5 +KFW_LIBS=$(KFW_DIR)\lib\$(CPU)\krb5_32.lib # Nmake uses carets to escape special characters KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1 !else diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 9db5094a4c..b0bf33a5f0 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -140,6 +140,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( !ENDIF !IF "$(KFW_DIR)" != "" /DKFW_DIR=$(KFW_DIR) \ + /DKFW_PATH=$(KFW_PATH) \ !ENDIF !IF "$(GNUTLS_DIR)" != "" /DGNUTLS_DIR=$(GNUTLS_DIR) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 677647b9af..02c9b04ca4 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -382,9 +382,9 @@ File "${PCRE_DIR}\bin\pcre3.dll" File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt" !endif !ifdef KFW_DIR -File "${KFW_DIR}\bin\comerr32.dll" -File "${KFW_DIR}\bin\krb5_32.dll" -File "${KFW_DIR}\bin\k5sprt32.dll" +File "${KFW_PATH}\comerr32.dll" +File "${KFW_PATH}\krb5_32.dll" +File "${KFW_PATH}\k5sprt32.dll" !endif !ifdef GNUTLS_DIR File "${GNUTLS_DIR}\bin\libgcrypt-11.dll" diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index b8ae3ef96e..29f08bce76 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2009-12-21" +export DOWNLOAD_TAG="2009-12-22" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` |