From 0ea49abc9dc8495d42325605ba5e2fcd626fc402 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Wed, 14 Oct 2009 01:22:42 -0700 Subject: makefile: add USE_PCRE option to force usage of PCRE for regex Signed-off-by: Steven Noonan --- crawl-ref/source/makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/makefile') diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index eb8a77506b..cecfb6afba 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -454,10 +454,18 @@ CFOTHERS_L += -DWIN32CONSOLE endif endif +USE_PCRE := n ifeq ($(OSNAME),WIN32) -INCLUDES_L += -Iutil/pcre +USE_PCRE := y +endif + +ifneq ($(USE_PCRE),n) +INCLUDES_L += -I$(PCRESRC) +DEFINES += -DREGEX_PCRE LIB += $(FPCRELIBA) -else +endif + +ifneq ($(UNAME_S),MINGW32) LIB += -l$(LIBCURS) endif @@ -529,7 +537,7 @@ PKG_SRC_DIR := $(SRC_PKG_BASE)-$(SRC_VERSION)-src SRC_PKG_TAR := $(PKG_SRC_DIR).tbz2 SRC_PKG_ZIP := $(PKG_SRC_DIR).zip -ifeq ($(UNAME_S),MINGW32) +ifneq ($(USE_PCRE),n) GAME_DEPENDS += $(FPCRELIBA) endif -- cgit v1.2.3-54-g00ecf