aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schickel2008-06-04 17:20:25 +0000
committerJohannes Schickel2008-06-04 17:20:25 +0000
commit73da6ab51ef86b89adad28a935ac22bad257b834 (patch)
tree176ae7f067d513f01a330757f97559d4922f693b /Makefile
parent0931f926d45db807806f433cde9114839c4de65e (diff)
downloadscummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.gz
scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.bz2
scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.zip
- Removed -Wconversion from compiler options for g++ 4.3, it's behavior has fundamently changed in g++ 4.3
- Added -Wno-empty-body and -Wno-parentheses as compiler flags for g++ 4.3 for *now* (we should think of removing -Wparentheses though) - Fixed some warnings for g++ 4.3 (only for the engines I'm using) svn-id: r32540
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"