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 /packaging | |
parent | 97f0fb0e5386ae4bfd759311d03727598556955c (diff) |
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 'packaging')
-rw-r--r-- | packaging/nsis/Makefile.nmake | 2 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 1c32f06f06..975b4885ff 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -204,6 +204,8 @@ NSIS_FLAGS=\ /DKFW_PATH=$(KFW_PATH) \ !ENDIF !IF "$(GNUTLS_DIR)" != "" + /DGPGERROR_DLL=$(GPGERROR_DLL) \ + /DGCC_DLL=$(GCC_DLL) \ /DGNUTLS_DIR=$(GNUTLS_DIR) \ !ENDIF !IF "$(ZLIB_DIR)" != "" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index cff66c2c0f..3c96c78b44 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -312,10 +312,16 @@ File "${STAGING_DIR}\krb5_32.dll" File "${STAGING_DIR}\k5sprt32.dll" !endif !ifdef GNUTLS_DIR -File "${STAGING_DIR}\libgcrypt-11.dll" -File "${STAGING_DIR}\libgnutls-26.dll" -File "${STAGING_DIR}\libgpg-error-0.dll" -File "${STAGING_DIR}\libtasn1-3.dll" +File "${STAGING_DIR}\libffi-6.dll" +File "${STAGING_DIR}\${GCC_DLL}" +File "${STAGING_DIR}\libgcrypt-20.dll" +File "${STAGING_DIR}\libgmp-10.dll" +File "${STAGING_DIR}\libgnutls-28.dll" +File "${STAGING_DIR}\${GPGERROR_DLL}" +File "${STAGING_DIR}\libhogweed-2-4.dll" +File "${STAGING_DIR}\libnettle-4-6.dll" +File "${STAGING_DIR}\libp11-kit-0.dll" +File "${STAGING_DIR}\libtasn1-6.dll" StrCmp "${INTL_DLL}" "libintl-8.dll" SkipLibIntl8 File "${STAGING_DIR}\libintl-8.dll" SkipLibIntl8: |