diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-13 12:58:38 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-13 12:58:54 -0400 |
| commit | fdca960661572976486f0989c4f12ca71d52b33a (patch) | |
| tree | 0a558b5b0db56a7b70741b5f252a06a755083fe0 /crawl-ref/source/Makefile | |
| parent | 0b545c0a442c7b84330c7899786a40ac305827dc (diff) | |
| download | crawl-ref-fdca960661572976486f0989c4f12ca71d52b33a.tar.gz crawl-ref-fdca960661572976486f0989c4f12ca71d52b33a.zip | |
Don't link against both contrib and system libpcre.
This broke CDO builds.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index f2465b214e..db39bd95cc 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -973,12 +973,12 @@ endif endif ifdef BUILD_PCRE -USE_PCRE = YesPlease -endif - -ifdef USE_PCRE DEFINES += -DREGEX_PCRE -LIBS += -lpcre +else + ifdef USE_PCRE + DEFINES += -DREGEX_PCRE + LIBS += -lpcre + endif endif ifdef USE_ICC |