diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-04 19:17:44 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-08 15:49:37 +0000 |
| commit | afa09b0f20b6198a07871fb5e8b2ec0c315bc3f9 (patch) | |
| tree | f03f4b2218951e0ac8ca15dca5887ac59da56dbc /packaging | |
| parent | d801c7fb9e6a8b647a910918470f33b69563d067 (diff) | |
| download | wireshark-afa09b0f20b6198a07871fb5e8b2ec0c315bc3f9.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>
(cherry picked from ad7b5381ac54567217f12ee729c7be6cd2848d0f)
Change-Id: I3f67b80e984e187ed65c0997fcd02ae3d715995b
Reviewed-on: https://code.wireshark.org/review/2021
Reviewed-by: Evan Huus <eapache@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: |