aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schickel2011-02-10 01:05:48 +0000
committerJohannes Schickel2011-02-10 01:05:48 +0000
commit9f6dc040ff56d6e1b4f77275acb3a1d4750a38e6 (patch)
treeb2ae909a56ad6e8403e7a7213d191f1c6be50ab9 /Makefile
parentece050e26c8397e32038662fcdc451bfa6e28351 (diff)
downloadscummvm-rg350-9f6dc040ff56d6e1b4f77275acb3a1d4750a38e6.tar.gz
scummvm-rg350-9f6dc040ff56d6e1b4f77275acb3a1d4750a38e6.tar.bz2
scummvm-rg350-9f6dc040ff56d6e1b4f77275acb3a1d4750a38e6.zip
CONFIGURE: Add basic support for ICC.
svn-id: r55862
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e8c8a17291..844a063f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,13 @@ ifeq "$(HAVE_CLANG)" "1"
CXXFLAGS+= -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants
endif
+ifeq "$(HAVE_ICC)" "1"
+ # Disable some warnings:
+ # 161: unrecognized #pragma
+ # 1899: multicharacter character literal (potential portability problem)
+ CXXFLAGS+= -diag-disable 161,1899
+endif
+
# Warn if global constructors are used. Only available in GCC with LLVM backend
# (and maybe clang?), hence off by default.
#CXXFLAGS+= -Wglobal-constructors