diff options
author | Guy Harris <guy@alum.mit.edu> | 2006-02-06 09:09:06 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2006-02-06 09:09:06 +0000 |
commit | ad3cb359b6a87ec58008551b25427734c5c64f93 (patch) | |
tree | d106fd919a112b7e947e2de4205b1c3907aa8c86 /epan/Makefile.nmake | |
parent | 86309dc6b83a4598e7cc4bab16713546d8837646 (diff) |
From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.
Define "ssl_data_set()" regardless of whether we have GNU TLS or
not, as it's used in either case.
Get rid of an extra #include of epan/gnuc_format_check.h.
svn path=/trunk/; revision=17177
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r-- | epan/Makefile.nmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 480e6af33c..9c323b48b0 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -11,7 +11,7 @@ include Makefile.common ############### no need to modify below this line ######### CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include \ + $(ZLIB_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -23,6 +23,7 @@ libethereal_LIBS = \ $(PCRE_LIBS) \ $(NETTLE_LIBS) \ $(ZLIB_LIBS) \ + $(GNUTLS_LIBS) \ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \ $(ICONV_DIR)\lib\iconv.lib \ ftypes\ftypes.lib \ |