diff options
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 3a88c7ca1b..04149802c2 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.370 2003/12/05 16:00:34 gerald Exp $ +# $Id: Makefile.nmake,v 1.371 2003/12/07 00:04:30 gerald Exp $ include config.nmake include <win32.mak> @@ -16,7 +16,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GTK_CFLAGS) /I. /Iwiretap \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \ /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \ - $(ADNS_CFLAGS) -D_U_="" + $(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_="" CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -512,6 +512,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GTK_LIBS) \ $(ADNS_LIBS) \ + $(PCRE_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib # $(PCAP_DIR)\lib\wpcap.lib @@ -521,6 +522,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ $(ADNS_LIBS) \ + $(PCRE_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ @@ -595,6 +597,7 @@ 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)/" \ + -e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \ -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \ -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \ |