summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-01 12:51:42 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-01 12:51:42 +0000
commitfa6442914486285d810d1d23e36397a915952577 (patch)
treee689496d9bb4129f19037b5f8909d6c7d75f6bd2
parentb7dca6eaaea41a065a810337fa8d3ba6a27df358 (diff)
downloadcrawl-ref-fa6442914486285d810d1d23e36397a915952577.tar.gz
crawl-ref-fa6442914486285d810d1d23e36397a915952577.zip
[1930849] Remove -Werror for platforms with ancient g++ that chokes on its own standard C++ headers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4012 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/makefile.dos2
-rw-r--r--crawl-ref/source/makefile.mgw5
-rw-r--r--crawl-ref/source/makefile_tiles.mgw4
3 files changed, 3 insertions, 8 deletions
diff --git a/crawl-ref/source/makefile.dos b/crawl-ref/source/makefile.dos
index 8573fd347f..367235ee27 100644
--- a/crawl-ref/source/makefile.dos
+++ b/crawl-ref/source/makefile.dos
@@ -35,7 +35,7 @@ INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
WORKDIR := $(shell cd)
-CFWARN := -Wall -Wwrite-strings -Wshadow -Werror -pedantic
+CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
CFOTHERS := -D$(OS_TYPE) $(EXTRA_FLAGS) -fsigned-char -fstrict-aliasing \
-DCLUA_BINDINGS
diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw
index 33d7b90573..adb822f0fa 100644
--- a/crawl-ref/source/makefile.mgw
+++ b/crawl-ref/source/makefile.mgw
@@ -39,10 +39,7 @@ FSQLLIBA := $(SQLLIB)\$(SQLIBA)
LIB = -static -lwinmm -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB)
INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
-CFWARN := -Wall -Wwrite-strings \
- -Wshadow \
- -Werror \
- -pedantic
+CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
CFOTHERS := -fsigned-char \
-fstrict-aliasing \
diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw
index 9f734c0519..90fc09f64e 100644
--- a/crawl-ref/source/makefile_tiles.mgw
+++ b/crawl-ref/source/makefile_tiles.mgw
@@ -39,9 +39,7 @@ FSQLLIBA := $(SQLLIB)\$(SQLIBA)
LIB = -static -lwinmm -mwindows -lcomctl32 -L$(LUASRC) -l$(LUALIB) -L$(SQLSRC) -l$(SQLLIB)
INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
-CFWARN := -Wall -Wwrite-strings \
- -Werror \
- -pedantic
+CFWARN := -Wall -Wwrite-strings -pedantic
CFOTHERS := -fsigned-char \
-fstrict-aliasing \