mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
Makefile: Move CUSTOMOPT to follow COMPILERFLAGS and LINKERFLAGS, so that it can overwrite more.
git-svn-id: https://svn.eduke32.com/eduke32@6086 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
ebf78c721d
commit
9d8b5d1ce0
1 changed files with 5 additions and 8 deletions
13
Common.mak
13
Common.mak
|
@ -1019,19 +1019,16 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM))
|
|||
REVFLAG += -DREV="\"r$(VC_REV)$(VC_REV_CUSTOM)\""
|
||||
endif
|
||||
|
||||
COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS)
|
||||
COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS)
|
||||
COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS)
|
||||
COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS)
|
||||
LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) $(COMMONFLAGS) $(LINKERFLAGS)
|
||||
COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
|
||||
COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
|
||||
COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
|
||||
COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
|
||||
LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) $(COMMONFLAGS) $(LINKERFLAGS) $(CUSTOMOPT)
|
||||
ifneq ($(CPLUSPLUS),0)
|
||||
COMPILER_C=$(COMPILER_CXX)
|
||||
COMPILER_OBJC=$(COMPILER_OBJCXX)
|
||||
endif
|
||||
|
||||
ifneq (,$(CUSTOMOPT))
|
||||
COMMONFLAGS+= $(CUSTOMOPT)
|
||||
endif
|
||||
ifneq (,$(CFLAGS))
|
||||
COMMONFLAGS+= $(CFLAGS)
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue