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/INSTALL | |
| 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/INSTALL')
| -rw-r--r-- | crawl-ref/INSTALL | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/crawl-ref/INSTALL b/crawl-ref/INSTALL index e2df113866..97da7927f3 100644 --- a/crawl-ref/INSTALL +++ b/crawl-ref/INSTALL @@ -213,17 +213,6 @@ binary will run on 9x), or build a DOS binary. * Build Crawl by running mingw32-make MAKEFILE=makefile.mgw install -* If you want regular expression support, you can edit AppHdr.h and - uncomment this line: - // #define REGEX_PCRE - Note that there are multiple // #define REGEX_PCRE lines in AppHdr.h - - find the one in the Windows-specific section. Also see the section - below on obtaining the pcre library to link against. - -* If you enabled REGEX_PCRE, add -lpcre to the LIB line in makefile.mgw as: - LIB = -lpcre -static -lwinmm -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) - and build Crawl to include regex support. - * If you have flex and bison, edit makefile.mgw and set DOYACC := y. * When you're done, you should have crawl.exe under a "rel" @@ -265,14 +254,6 @@ Building for DOS (djgpp) * Build Crawl by running make MAKEFILE=makefile.dos -* If you want PCRE, edit makefile.dos and change this line: - CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS) - to - CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS) -DREGEX_PCRE - And add -lpcre to the LIB line in makefile.dos, like so: - LIB = -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -lpcre - then build Crawl. - * When the build is done, crawl.exe should be in the source directory. Building Tiles versions @@ -376,20 +357,16 @@ to enable user-scripts is to uncomment CLUA_BINDINGS in AppHdr.h. PCRE ---- +As of 0.4.2, PCRE 7.7 source is included with Crawl. It is enabled +by default. The sources in pcre/util are identical to the 7.7 distro +except for removed cmake, doc, and testdata folders (unused by Crawl) +and a hand-rolled Makefile. On Unixes, you're better served by the existing POSIX regular expression support. If you want PCRE, your package management system is again your best bet. Remember to install development headers, not just the plain library. -On Windows, PCRE binaries are available from -http://gnuwin32.sourceforge.net/packages/pcre.htm - -On DOS you get the joy of building PCRE yourself. It's a little more -annoying than building Lua (you have to roll your own makefile), but -not by much. - - Unicode (Unix only) ------------------- |