diff options
| author | Gerald Combs <gerald@wireshark.org> | 2003-12-07 00:04:32 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2003-12-07 00:04:32 +0000 |
| commit | 409948eced9af8a2b39347e15bb7d69fe42e9c4a (patch) | |
| tree | 7f263b2f58b577b08ab995c387ad2ad02ab99ca8 /epan | |
| parent | d9dec105d65bf420f86c7242415a0a0ad885e0a2 (diff) | |
Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.nmake | 10 | ||||
| -rw-r--r-- | epan/config.h.win32 | 5 | ||||
| -rw-r--r-- | epan/ftypes/Makefile.nmake | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 0fc102c365..eea89b3e72 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -1,14 +1,15 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.31 2003/10/13 19:04:55 guy Exp $ +# $Id: Makefile.nmake,v 1.32 2003/12/07 00:04:31 gerald Exp $ include ..\config.nmake ############### no need to modify below this line ######### CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GTK_CFLAGS) \ - $(ADNS_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + $(ADNS_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include \ + -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -56,7 +57,10 @@ ethereal.lib : config.h $(OBJECTS) lib /out:ethereal.lib $(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_PCRE@/$(PCRE_CONFIG)/" \ + < config.h.win32 > $@ clean: rm -f $(OBJECTS) ethereal.lib $(PDB_FILE) diff --git a/epan/config.h.win32 b/epan/config.h.win32 index 40a6a88e8d..81c4d8d8b2 100644 --- a/epan/config.h.win32 +++ b/epan/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.12 2003/06/12 09:45:42 guy Exp $ */ +/* $Id: config.h.win32,v 1.13 2003/12/07 00:04:31 gerald Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -75,6 +75,9 @@ @HAVE_GNU_ADNS@ #define ADNS_JGAA_WIN32 1 +/* Define to use the PCRE library */ +@HAVE_PCRE@ + #define HAVE_PLUGINS 1 #define PLUGINS_NEED_ADDRESS_TABLE 1 diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 6ad6e5df23..1d8f3d3cc1 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -1,14 +1,14 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:47 guy Exp $ +# $Id: Makefile.nmake,v 1.7 2003/12/07 00:04:32 gerald Exp $ include ..\..\config.nmake ############### no need to modify below this line ######### CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GTK_CFLAGS) \ - /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) + $(PCRE_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL |