summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makefile
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-10-14 01:22:42 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-10-14 01:24:29 -0700
commit0ea49abc9dc8495d42325605ba5e2fcd626fc402 (patch)
treeb7674fd070e9feed036b2c5ff02ceae8f2463419 /crawl-ref/source/makefile
parent42f60b21d0b8f1724419bf944f7893b91b0246f1 (diff)
downloadcrawl-ref-0ea49abc9dc8495d42325605ba5e2fcd626fc402.tar.gz
crawl-ref-0ea49abc9dc8495d42325605ba5e2fcd626fc402.zip
makefile: add USE_PCRE option to force usage of PCRE for regex
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
-rw-r--r--crawl-ref/source/makefile14
1 files changed, 11 insertions, 3 deletions
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