mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-28 10:42:34 +00:00
Merge Makefile.cfg
This commit is contained in:
parent
4f47775d51
commit
c64d8e11d2
1 changed files with 0 additions and 15 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue