thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Makefile.cfg

Browse source
This commit is contained in:
Sally Coolatta 2020-08-09 15:52:32 -04:00
parent 4f47775d51
commit c64d8e11d2
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Makefile.cfg
View file

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