Merge Makefile.cfg

This commit is contained in:
Sally Coolatta 2020-08-09 15:52:32 -04:00
parent 4f47775d51
commit c64d8e11d2

View file

@ -13,21 +13,12 @@ endif
ifdef GCC83
GCC82=1
<<<<<<< HEAD
endif
ifdef GCC82
GCC81=1
endif
=======
endif
ifdef GCC82
GCC81=1
endif
>>>>>>> srb2/next
ifdef GCC81
GCC72=1
endif
@ -235,13 +226,7 @@ ifdef GCC61
WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
endif
ifdef GCC71
<<<<<<< HEAD
WFLAGS+=-Wno-error=implicit-fallthrough
WFLAGS+=-Wno-implicit-fallthrough
WFLAGS+=-Wno-format-truncation
=======
WFLAGS+=-Wimplicit-fallthrough=4
>>>>>>> srb2/next
endif
ifdef GCC81
WFLAGS+=-Wno-error=format-overflow