diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-08 00:13:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-08 00:13:57 +0000 |
| commit | e5be6520566f23e19158e35b221f65b715d3cd8e (patch) | |
| tree | 5ff26b3331cb9fb2f885b6338241a4edbee1837d /config.nmake | |
| parent | 7c276becfde09c74d8cf93253e4fa2c503b4aa93 (diff) | |
Fix compilation under Windows. Allocate our hash buffer dynamically so
that _chkstk doesn't throw a hissy fit. When hashing, open the file in
binary mode.
svn path=/trunk/; revision=31192
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index c08a80ab1e..46c25b8136 100644 --- a/config.nmake +++ b/config.nmake @@ -1047,10 +1047,11 @@ NETTLE_CONFIG= GNUTLS_PATH=$(GNUTLS_DIR) # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL +GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-11.lib GNUTLS_LIBS=\ $(GNUTLS_DIR)\bin\libtasn1-3.lib \ $(GNUTLS_DIR)\bin\libgpg-error-0.lib \ - $(GNUTLS_DIR)\bin\libgcrypt-11.lib \ + $(GCRYPT_LIBS) \ $(GNUTLS_DIR)\bin\libgnutls-26.lib # Nmake uses carets to escape special characters GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1 |