diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-04 19:17:44 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-06 15:33:01 +0000 |
| commit | ad7b5381ac54567217f12ee729c7be6cd2848d0f (patch) | |
| tree | 657b9b157455eb8d55713ea7d8df20c583b492fd /Makefile.nmake | |
| parent | 97f0fb0e5386ae4bfd759311d03727598556955c (diff) | |
| download | wireshark-ad7b5381ac54567217f12ee729c7be6cd2848d0f.tar.gz | |
Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 066577ea67..4f76b0da5d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1071,6 +1071,7 @@ clean_setup: rm -r -f gnutls-2.8.5-*-win??ws rm -r -f gnutls-2.10.3-*-win??ws rm -r -f gnutls-2.12.18-*-win??ws + rm -r -f gnutls-3.1.22-*-win??ws !IF "$(GTK_NAME)" == "gtk2" rm -r -f gtk2 !ELSE @@ -1356,10 +1357,16 @@ install-all: install-generated-files xcopy $(KFW_PATH)\k5sprt32.dll $(INSTALL_DIR) /d !ENDIF !IFDEF GNUTLS_DIR - xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libffi-6.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\$(GCC_DLL) $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libgcrypt-20.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libgmp-10.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libgnutls-28.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\$(GPGERROR_DLL) $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libhogweed-2-4.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libnettle-4-6.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libp11-kit-0.dll $(INSTALL_DIR) /d + xcopy $(GNUTLS_DIR)\bin\libtasn1-6.dll $(INSTALL_DIR) /d ! IF "$(INTL_DLL)" != "libintl-8.dll" # The gtk+ bundle doesn't provide libintl-8.dll (which is the case # with the 32-bit package); use the GNUTLS version. |