From f303a5c155b1cd7791605614ff3f944ec93dd77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Thu, 5 Feb 2015 15:38:41 +0100 Subject: disable a GCC warning with CPP11=1 (nw) also moved clang C++11 warning supression into CPP11 define --- src/build/flags_clang.mak | 6 ++++-- src/build/flags_gcc.mak | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/build/flags_clang.mak b/src/build/flags_clang.mak index bf2db03fb42..3d3837512af 100644 --- a/src/build/flags_clang.mak +++ b/src/build/flags_clang.mak @@ -23,6 +23,10 @@ ifneq (,$(findstring memory,$(SANITIZE))) CCOMFLAGS += -fsanitize-memory-track-origins -fPIE endif +ifdef CPP11 +CCOMFLAGS += -Wno-deprecated-register -Wno-reserved-user-defined-literal -Wno-c++11-narrowing +endif + # TODO: needs to use $(CC) TEST_CLANG := $(shell clang --version) @@ -32,8 +36,6 @@ endif ifeq ($(findstring 3.5,$(TEST_CLANG)),3.5) CCOMFLAGS += -Wno-inline-new-delete -# these show up when compiling as c++11 -CCOMFLAGS += -Wno-deprecated-register -Wno-reserved-user-defined-literal -Wno-c++11-narrowing # caused by src/mess/drivers/x07.c, src/osd/sdl/window.c, src/emu/sound/disc_mth.inc, src/mame/video/chihiro.c CCOMFLAGS += -Wno-absolute-value diff --git a/src/build/flags_gcc.mak b/src/build/flags_gcc.mak index 167c971ce9c..73dc3ee8568 100644 --- a/src/build/flags_gcc.mak +++ b/src/build/flags_gcc.mak @@ -1,6 +1,10 @@ # TODO: needs to use $(CC) TEST_GCC := $(shell gcc --version) +ifdef CPP11 + CPPONLYFLAGS += -Wno-literal-suffix +endif + ifeq ($(findstring 4.7.,$(TEST_GCC)),4.7.) CCOMFLAGS += -Wno-narrowing -Wno-attributes endif -- cgit v1.2.3