From 343ba001ffb116ddadb275d23645861a60bbbdbc Mon Sep 17 00:00:00 2001
From: ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 27 Jul 2008 14:24:02 +0000
Subject: Added PCRE into the source tree.  Updated documentation to reflect
 that PCRE is now on by default on Windows/DOS.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6696 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/makefile_tiles.mgw | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/source/makefile_tiles.mgw')

diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw
index fed4392b7a..4a8617c118 100644
--- a/crawl-ref/source/makefile_tiles.mgw
+++ b/crawl-ref/source/makefile_tiles.mgw
@@ -36,8 +36,12 @@ SQLLIB := sqlite3
 SQLIBA   := lib$(SQLLIB).a
 FSQLLIBA := $(SQLLIB)\$(SQLIBA)
 
-LIB = -static -lwinmm -mwindows -lcomctl32 -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -lpcre
-INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
+PCRESRC := util\pcre
+PCRELIB := pcre
+PCRELIBA := lib$(PCRELIB).a
+
+LIB = -static -lwinmm -mwindows -lcomctl32 -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -L$(PCRESRC) -l$(PCRELIB)
+INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC) -I$(PCRESRC)
 
 CFWARN := -Wall -Wwrite-strings -pedantic
 
@@ -95,7 +99,7 @@ OBJECTS      := levcomp.tab.o levcomp.lex.o \
 
 OBJECTS := $(foreach file,$(OBJECTS),$(OPATH)/$(file))
 
-GAME_DEPENDS := prepare $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(TILEHEADERS) $(DESTTILEFILES) $(OBJECTS)
+GAME_DEPENDS := prepare $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(PCRESRC)\$(PCRELIBA) $(TILEHEADERS) $(DESTTILEFILES) $(OBJECTS)
 
 ##########################################################################
 
@@ -203,7 +207,10 @@ clean-lua:
 clean-sql:
 	    cd $(SQLSRC) && $(MAKE) "RM_F=del /f" clean
 
-distclean: clean clean-lua clean-sql clean-rltiles
+clean-pcre:
+	    cd $(PCRESRC) && $(MAKE)
+
+distclean: clean clean-lua clean-sql clean-pcre clean-rltiles
 		$(DELETE) $(OPATH)\*.o
 		$(DELETE) *.o
 		$(DELETE) bones.*
@@ -253,6 +260,13 @@ $(FSQLLIBA):
 	@echo Building SQLite
 	cd $(SQLSRC) && $(MAKE)
 
+#############################################################################
+# Build PCRE
+
+$(PCRESRC)\$(PCRELIBA):
+	@echo Building PCRE...
+	@cd $(PCRESRC) && $(MAKE)
+
 ##########################################################################
 # Resources
 #
-- 
cgit v1.2.3-54-g00ecf