diff options
author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 14:24:02 +0000 |
---|---|---|
committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 14:24:02 +0000 |
commit | 343ba001ffb116ddadb275d23645861a60bbbdbc (patch) | |
tree | 300151e597f37ea8660f59819e47861b3036b23b /crawl-ref/source/makefile.dos | |
parent | 09f449f50d9f136fb7dd0dfb848ee953b2851aaf (diff) | |
download | crawl-ref-343ba001ffb116ddadb275d23645861a60bbbdbc.tar.gz crawl-ref-343ba001ffb116ddadb275d23645861a60bbbdbc.zip |
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
Diffstat (limited to 'crawl-ref/source/makefile.dos')
-rw-r--r-- | crawl-ref/source/makefile.dos | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile.dos b/crawl-ref/source/makefile.dos index 6733c95a90..0027575db1 100644 --- a/crawl-ref/source/makefile.dos +++ b/crawl-ref/source/makefile.dos @@ -30,8 +30,12 @@ SQLLIB := sql3 SQLLIBA := lib$(SQLLIB).a FSQLLIBA := $(SQLSRC)\$(SQLLIBA) -LIB = -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 = -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -L$(PCRESRC) -lpcre +INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC) -I$(PCRESRC) WORKDIR := $(shell cd) @@ -62,7 +66,7 @@ endif OBJECTS := $(UTIL)levtab.o $(UTIL)levlex.o $(OBJECTS) -GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(OBJECTS) +GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(PCRESRC)\$(PCRELIBA) $(OBJECTS) ########################################################################## @@ -137,7 +141,13 @@ clean-sql: $(MAKE) "RM_F=cmd /c del /f" clean cd $(WORKDIR) -distclean: clean-lua clean-sql +clean-pcre: + cd $(PCRESRC) + $(MAKE) clean + cd $(WORKDIR) + + +distclean: clean-lua clean-sql clean-pcre $(DELETE) *.o $(DELETE) bones.* $(DELETE) morgue.txt @@ -184,3 +194,11 @@ $(FSQLLIBA): $(MAKE) LIBSQL=$(SQLLIBA) cd $(WORKDIR) +############################################################################# +# Build PCRE + +$(PCRESRC)\$(PCRELIBA): + @echo Building PCRE... + @cd $(PCRESRC) + @$(MAKE) CXX=$(CXX) + @cd $(WORKDIR) |