diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-05 05:03:15 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-05 05:03:15 +0000 |
| commit | 3a1a07c46a8455c8f2fadd1b379473343c6883f4 (patch) | |
| tree | 69d1c471a15d7c5ad8663024a6daddd78703d28a /config.nmake | |
| parent | b6fd719414a8de20200533a0670770058c7b25b4 (diff) | |
compile error in openssl.h depends on the Platform SDK, not the MSVC variant used
change the !IFDEF around GNUTLS accordingly
svn path=/trunk/; revision=20323
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 54c6cf556a..21663822e9 100644 --- a/config.nmake +++ b/config.nmake @@ -218,8 +218,8 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4 # If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR # isn't defined. # -# XXX - GNUTLS headers doesn't compile on MSVC 2005 -!IF "$(MSVC_VARIANT)" == "MSVC6" +# Platform SDK conflicts with openssl.h header +!IFNDEF PLATFORM_SDK_DIR GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1 !ENDIF |