aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristopher Page2008-06-05 21:20:35 +0000
committerChristopher Page2008-06-05 21:20:35 +0000
commitcae6396ce76991e240b1e23bbcff0b6d6960f9a0 (patch)
tree58ea9c6a42d7bf3655e775e3a26f6739e9daffe1 /Makefile
parent18b892e534c9fedf60a57c71e0978965d353fd60 (diff)
parent3c7e0f5f8dc39e27619f7d23d060264db8d906d3 (diff)
downloadscummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.tar.gz
scummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.tar.bz2
scummvm-rg350-cae6396ce76991e240b1e23bbcff0b6d6960f9a0.zip
Merged revisions 32507-32513,32516,32518,32520-32521,32523-32524,32526-32548,32550-32562 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r32563
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d230120bb0..506265032a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ CXXFLAGS:= -Wall $(CXXFLAGS)
# Turn off some annoying and not-so-useful warnings
CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
# Enable even more warnings...
-CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
+CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align
CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor -Wwrite-strings
# Disable RTTI and exceptions, and enabled checking of pointers returned by "new"