Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3b8ca5f343
|
@ -108,6 +108,10 @@ endif
|
||||||
CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
||||||
CFLAGS += $(CSTANDARD)
|
CFLAGS += $(CSTANDARD)
|
||||||
|
|
||||||
|
# This fixes lots of keyboards linking errors but SHOULDN'T BE A FINAL SOLUTION
|
||||||
|
# Fixing of multiple variable definitions must be made.
|
||||||
|
CFLAGS += -fcommon
|
||||||
|
|
||||||
#---------------- Compiler Options C++ ----------------
|
#---------------- Compiler Options C++ ----------------
|
||||||
# -g*: generate debugging information
|
# -g*: generate debugging information
|
||||||
# -O*: optimization level
|
# -O*: optimization level
|
||||||
|
@ -124,6 +128,7 @@ CXXFLAGS += -O$(OPT)
|
||||||
CXXFLAGS += -w
|
CXXFLAGS += -w
|
||||||
CXXFLAGS += -Wall
|
CXXFLAGS += -Wall
|
||||||
CXXFLAGS += -Wundef
|
CXXFLAGS += -Wundef
|
||||||
|
|
||||||
ifneq ($(strip $(ALLOW_WARNINGS)), yes)
|
ifneq ($(strip $(ALLOW_WARNINGS)), yes)
|
||||||
CXXFLAGS += -Werror
|
CXXFLAGS += -Werror
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue