X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=Makefile;h=e71d9d1c10d656da49ad3a9901544c6646907149;hp=7790a1829a0f9e3d3899fe0e32a0bda514588e84;hb=feb6974bd5e09f580ec6707ae8159fdf587c85af;hpb=f4d36101d18955b4efc184a381c1f54d39e54abc diff --git a/Makefile b/Makefile index 7790a1829..e71d9d1c1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc DIFF ?= diff FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"' -FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) +FTEQCCFLAGS ?= -Werror -Wno-Q302 -O3 -Ono-c -Ono-cs $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK) FTEQCCFLAGS_PROGS ?= FTEQCCFLAGS_MENU ?= @@ -38,17 +38,17 @@ skin: gfx/menu/default/skinvalues.txt clean: rm -f progs.dat menu.dat csprogs.dat -FILES_CSPROGS = qcsrc/client/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ ],qcsrc/client/&,' < qcsrc/client/progs.src) +FILES_CSPROGS = qcsrc/client/progs.src $(shell sed '/\.dat/d; s,//.*,,; s,[^ ],qcsrc/client/&,' < qcsrc/client/progs.src) csprogs.dat: $(FILES_CSPROGS) @echo make[1]: Entering directory \`$(PWD)/qcsrc/client\' cd qcsrc/client && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -FILES_PROGS = qcsrc/server/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ ],qcsrc/server/&,' < qcsrc/server/progs.src) +FILES_PROGS = qcsrc/server/progs.src $(shell sed '/\.dat/d; s,//.*,,; s,[^ ],qcsrc/server/&,' < qcsrc/server/progs.src) progs.dat: $(FILES_PROGS) @echo make[1]: Entering directory \`$(PWD)/qcsrc/server\' cd qcsrc/server && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_PROGS) -FILES_MENU = qcsrc/menu/progs.src $(shell sed '/\.dat$$/d; s,//.*,,; s,[^ ],qcsrc/menu/&,' < qcsrc/menu/progs.src) +FILES_MENU = qcsrc/menu/progs.src $(shell sed '/\.dat/d; s,//.*,,; s,[^ ],qcsrc/menu/&,' < qcsrc/menu/progs.src) menu.dat: $(FILES_MENU) @echo make[1]: Entering directory \`$(PWD)/qcsrc/menu\' cd qcsrc/menu && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_MENU)