diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 22:57:52 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-11 22:57:52 +0000 |
| commit | 7539c15678961228402166fa839fedf69f978379 (patch) | |
| tree | 66cc6e4cdb57cd682e46ec6957c23c47361b9273 /crawl-ref | |
| parent | 67542af0f209f270c37cb79b3e6d90b0af226c46 (diff) | |
| download | crawl-ref-7539c15678961228402166fa839fedf69f978379.tar.gz crawl-ref-7539c15678961228402166fa839fedf69f978379.zip | |
Enabling PCRE in Windows makefiles. Because we release with libpcre enabled, it makes sense to have that be on by default.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6507 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.mgw | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile_tiles.mgw | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 87f5b9e55d..4177673947 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -196,8 +196,8 @@ // #define WINMM_PLAY_SOUNDS // Use Perl-compatible regular expressions. libpcre must be available and - // linked in. - // #define REGEX_PCRE + // linked in. This is optional. + #define REGEX_PCRE #else #error Missing platform #define or unsupported compiler. #endif diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw index 5f1350c361..f60dd5ffc8 100644 --- a/crawl-ref/source/makefile.mgw +++ b/crawl-ref/source/makefile.mgw @@ -36,7 +36,7 @@ SQLLIB := sqlite3 SQLIBA := lib$(SQLLIB).a FSQLLIBA := $(SQLLIB)\$(SQLIBA) -LIB = -static -lwinmm -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) +LIB = -static -lwinmm -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -lpcre INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC) CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw index 523fb18a9c..dae38c86f2 100644 --- a/crawl-ref/source/makefile_tiles.mgw +++ b/crawl-ref/source/makefile_tiles.mgw @@ -36,7 +36,7 @@ SQLLIB := sqlite3 SQLIBA := lib$(SQLLIB).a FSQLLIBA := $(SQLLIB)\$(SQLIBA) -LIB = -static -lwinmm -mwindows -lcomctl32 -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) +LIB = -static -lwinmm -mwindows -lcomctl32 -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB) -lpcre INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC) CFWARN := -Wall -Wwrite-strings -pedantic @@ -48,7 +48,6 @@ CFOTHERS := -fsigned-char \ -D$(OS_TYPE) $(EXTRA_FLAGS) \ -DWINMM_PLAY_SOUNDS -DCLUA_BINDINGS \ -DUSE_TILE -DWINVER=0x0400 -D_WIN32_IE=0x0400 -# -DREGEX_PCRE CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS) YCFLAGS := $(INCLUDES) $(CFOTHERS) |