diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-10 09:48:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-10 09:48:54 +0000 |
| commit | bd2ea47524fe1cb574cadbe9448ce918ee3d58e2 (patch) | |
| tree | 0c7c8669aefcea2eedb7451ef282073bdcfdc134 /Makefile.nmake | |
| parent | e75b86fab1d1f5841046dc3dff1ae1fbb679d77b (diff) | |
Configure whether we have WinPcap based on whether WINPCAP_VERSION is
set in the config.nmake file.
Configure whether we have pcap_findalldevs() based on whether
WINPCAP_VERSION is 2.3 (if so, we don't) or 3.0 or 3.1 (if so, we do).
WinPcap 3.0 has the new libpcap declarations of "pcap_lookupnet()" and
"pcap_open_live()" in which the first argument is a "const char *"
rather than a "char *"; declare the functions and pointers to them
appropriately based on the version of WinPcap.
If we don't have pcap_findalldevs(), don't declare a pointer to it, as
we don't have a declaration of pcap_if_t.
We also need to refer to "pcap_freealldevs()", so make a pointer for it.
"symbols[]" is a const array; make the pointer to elements in it a const
pointer.
Fix some typoes.
svn path=/trunk/; revision=8660
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a2698cd5f8..b02a968230 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.344 2003/10/06 19:25:20 guy Exp $ +# $Id: Makefile.nmake,v 1.345 2003/10/10 09:48:54 guy Exp $ include config.nmake include <win32.mak> @@ -566,7 +566,12 @@ randpkt.exe : $(randpkt_OBJECTS) $(EXTRA_OBJECTS) << config.h : config.h.win32 config.nmake - sed -e s/@VERSION@/$(VERSION)/ -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" < config.h.win32 > $@ + sed -e s/@VERSION@/$(VERSION)/ \ + -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \ + -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ + -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \ + -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ + < config.h.win32 > $@ ps.c : rdps.exe print.ps rdps print.ps ps.c |