diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-23 23:04:03 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-06-23 23:04:03 +0000 |
| commit | ab6154f867ff33ca09d91281879a6488fa454c59 (patch) | |
| tree | c05161da208e83b868da29906642fa7917dbcfc1 /config.nmake | |
| parent | 16266cc6885905bcfe68f925480045c5509cd39f (diff) | |
Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37778 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/config.nmake b/config.nmake index 30026c8006..69c6914ed6 100644 --- a/config.nmake +++ b/config.nmake @@ -315,18 +315,6 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125 C_ARES_PKG=1.7.1 # -# Optional: the PCRE (Perl Compatible Regular Expressions) library -# enables regular expressions for display filters. -# -# If you have the PCRE library, set this to the directory in which -# the GNUWIN32 pcre-lib package is stored. -# -# If you don't have PCRE, comment this line out, so that PCRE_DIR -# isn't defined. -# -#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 - -# # Optional: the GNUTLS library enables ssl decryption. # # If you have the GNUTLS library, set this to the package version. @@ -522,18 +510,6 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125 C_ARES_PKG=1.7.1 # -# Optional: the PCRE (Perl Compatible Regular Expressions) library -# enables regular expressions for display filters. -# -# If you have the PCRE library, set this to the directory in which -# the GNUWIN32 pcre-lib package is stored. -# -# If you don't have PCRE, comment this line out, so that PCRE_DIR -# isn't defined. -# -#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 - -# # Optional: the GNUTLS library enables ssl decryption. # # If you have the GNUTLS library, set this to the package version. @@ -1191,18 +1167,6 @@ KFW_LIBS= KFW_CONFIG= !ENDIF -!IFDEF PCRE_DIR -PCRE_PATH=$(PCRE_DIR)\bin -PCRE_CFLAGS=/I$(PCRE_DIR)\include -PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib -# Nmake uses carets to escape special characters -PCRE_CONFIG=^#define HAVE_LIBPCRE 1 -!else -PCRE_CFLAGS= -PCRE_LIBS= -PCRE_CONFIG= -!ENDIF - !IFDEF NETTLE_DIR NETTLE_CFLAGS=/I$(NETTLE_DIR) NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib |