From 7fbee490e51d1b2cbda00508d938593cc0c22018 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 22 Mar 2017 15:45:54 +0000 Subject: [PATCH] Makefile: Unfactor CWARNS from COMPILER_*. git-svn-id: https://svn.eduke32.com/eduke32@6084 1a8010ca-5511-0410-912e-c29ae57300e0 --- Common.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common.mak b/Common.mak index 4d3508952..1ae6adfad 100644 --- a/Common.mak +++ b/Common.mak @@ -580,7 +580,7 @@ endif COMMONFLAGS+= -funsigned-char -fno-strict-aliasing $(F_JUMP_TABLES) -COMPILERFLAGS+= $(CWARNS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 +COMPILERFLAGS+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ifeq (0,$(NETCODE)) COMPILERFLAGS+= -DNETCODE_DISABLE @@ -1017,10 +1017,10 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM)) REVFLAG += -DREV="\"r$(VC_REV)$(VC_REV_CUSTOM)\"" endif -COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) -COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) -COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) -COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(COMPILERFLAGS) +COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) +COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) +COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) +COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) $(COMMONFLAGS) $(LINKERFLAGS) ifneq ($(CPLUSPLUS),0) COMPILER_C=$(COMPILER_CXX)