diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 15:22:05 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 15:22:05 +0000 |
| commit | 2bc81f91014a486989b79eb5b902956ef98989bd (patch) | |
| tree | 753236dcf9000efc6f2ea32cca848498206ba410 /crawl-ref/source/makefile.dos | |
| parent | a6bfa9cade3cc7804e10a70c3b3344187256a26e (diff) | |
| download | crawl-ref-2bc81f91014a486989b79eb5b902956ef98989bd.tar.gz crawl-ref-2bc81f91014a486989b79eb5b902956ef98989bd.zip | |
Applying r6696 back to trunk (PCRE support).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6698 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 a882085a37..999c9321ef 100644 --- a/crawl-ref/source/makefile.dos +++ b/crawl-ref/source/makefile.dos @@ -32,8 +32,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) @@ -64,7 +68,7 @@ endif OBJECTS := $(UTIL)levtab.o $(UTIL)levlex.o $(OBJECTS) -GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(OBJECTS) +GAME_DEPENDS := $(LUASRC)\$(LUALIBA) $(FSQLLIBA) $(PCRESRC)\$(PCRELIBA) $(OBJECTS) ########################################################################## @@ -139,7 +143,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 @@ -186,3 +196,11 @@ $(FSQLLIBA): $(MAKE) LIBSQL=$(SQLLIBA) cd $(WORKDIR) +############################################################################# +# Build PCRE + +$(PCRESRC)\$(PCRELIBA): + @echo Building PCRE... + @cd $(PCRESRC) + @$(MAKE) CXX=$(CXX) + @cd $(WORKDIR) |