From e64ecfbf4f2f5f1466f8eb774401304fa6929267 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Wed, 17 Apr 2013 20:34:51 +0000 Subject: [PATCH] OS X: Pass -Wno-narrowing only with GCC 4.3+, fixing arttool build on my setup. git-svn-id: https://svn.eduke32.com/eduke32@3691 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index c4ede6792..209c9b7c3 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -270,7 +270,7 @@ endif # compiler flags etc. BASECFLAGS= BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement -BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings -Wno-narrowing +BASECXXFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings BASEASFLAGS=-s #-g BASELDFLAGS= @@ -281,6 +281,13 @@ ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) endif endif +# XXX: I (Helixhorned) only know that there's no -Wnarrowing on my OS X 10.6 using GCC 4.2. +ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4))) + ifeq (1,$(strip $(shell expr $(GCC_MINOR) \>= 3))) + BASECXXFLAGS+= -Wno-narrowing + endif +endif + ifeq ($(PLATFORM),WII) override USE_LIBVPX = 0 endif