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 /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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 8921968935..e5006d1367 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -16,7 +16,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ - $(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_ + $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -56,7 +56,8 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + $(GNUTLS_LIBS) !ENDIF # $(PCAP_DIR)\lib\wpcap.lib @@ -72,7 +73,8 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + $(GNUTLS_LIBS) !ENDIF capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -103,7 +105,8 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + $(GNUTLS_LIBS) !ENDIF randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -224,6 +227,7 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \ -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \ -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ + -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \ < config.h.win32 > $@ ps.c : rdps.exe print.ps |