X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=3396ec68ff088a4e6f96e9405e5401e2196a91cc;hp=fea33566c7340c90010e19ca4e7ffc0dbaf68e13;hb=a68f0fcb355db42acabe72da5939fbd1b04f6016;hpb=f892b323351eb110dc97b8cf4e15d03dddc6fb78 diff --git a/Makefile b/Makefile index fea3356..3396ec6 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,10 @@ -DESTDIR := -OPTIONAL:= -PREFIX := /usr/local -BINDIR := $(PREFIX)/bin -DATADIR := $(PREFIX)/share -MANDIR := $(DATADIR)/man +include include.mk UNAME ?= $(shell uname) CYGWIN = $(findstring CYGWIN, $(UNAME)) MINGW = $(findstring MINGW32, $(UNAME)) -CC ?= clang -# linker flags and optional additional libraries if required -LDFLAGS += -LIBS += -lm - -CFLAGS += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL) +CFLAGS += -O3 -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL) ifneq ($(shell git describe --always 2>/dev/null),) CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\"" endif @@ -29,7 +19,9 @@ ifeq ($(CC), clang) -Wno-conversion \ -Wno-missing-prototypes \ -Wno-float-equal \ - -Wno-unknown-warning-option + -Wno-unknown-warning-option \ + -Wno-cast-align \ + -Wstrict-prototypes else #Tiny C Compiler doesn't know what -pedantic-errors is # and instead of ignoring .. just errors. @@ -38,23 +30,18 @@ else else CFLAGS += -Wno-pointer-sign -fno-common endif + + #-Wstrict-prototypes is not valid in g++ + ifneq ($(CC), g++) + CFLAGS += -Wstrict-prototypes + endif endif -ifeq ($(track), no) - CFLAGS += -DNOTRACK -endif - -OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o fs.o utf8.o correct.o -OBJ_P = util.o fs.o conout.o opts.o pak.o -OBJ_T = test.o util.o conout.o fs.o -OBJ_C = main.o lexer.o parser.o fs.o -OBJ_X = exec-standalone.o util.o conout.o fs.o - #we have duplicate object files when dealing with creating a simple list #for dependinces. To combat this we use some clever recrusive-make to #filter the list and remove duplicates which we use for make depend RMDUP = $(if $1,$(firstword $1) $(call RMDUP,$(filter-out $(firstword $1),$1))) -DEPS := $(call RMDUP, $(OBJ_D) $(OBJ_P) $(OBJ_T) $(OBJ_C) $(OBJ_X)) +DEPS := $(call RMDUP, $(OBJ_P) $(OBJ_T) $(OBJ_C) $(OBJ_X)) ifneq ("$(CYGWIN)", "") #nullify the common variables that @@ -66,7 +53,7 @@ ifneq ("$(CYGWIN)", "") QCVM = qcvm.exe GMQCC = gmqcc.exe TESTSUITE = testsuite.exe - PAK = pak.exe + PAK = gmqpak.exe else ifneq ("$(MINGW)", "") #nullify the common variables that @@ -87,85 +74,7 @@ else endif endif -#gource flags -GOURCEFLAGS= \ - --date-format "%d %B, %Y" \ - --seconds-per-day 0.01 \ - --auto-skip-seconds 1 \ - --title "GMQCC" \ - --key \ - --camera-mode overview \ - --highlight-all-users \ - --file-idle-time 0 \ - --hide progress,mouse \ - --stop-at-end \ - --max-files 99999999999 \ - --max-file-lag 0.000001 \ - --bloom-multiplier 1.3 \ - --logo doc/html/gmqcc.png \ - -1280x720 - -#ffmpeg flags for gource -FFMPEGFLAGS= \ - -y \ - -r 60 \ - -f image2pipe \ - -vcodec ppm \ - -i - \ - -vcodec libx264 \ - -preset ultrafast \ - -crf 1 \ - -threads 0 \ - -bf 0 - -#splint flags -SPLINTFLAGS = \ - -redef \ - -noeffect \ - -nullderef \ - -usedef \ - -type \ - -mustfreeonly \ - -nullstate \ - -varuse \ - -mustfreefresh \ - -compdestroy \ - -compmempass \ - -nullpass \ - -onlytrans \ - -predboolint \ - -boolops \ - -incondefs \ - -macroredef \ - -retvalint \ - -nullret \ - -predboolothers \ - -globstate \ - -dependenttrans \ - -branchstate \ - -compdef \ - -temptrans \ - -usereleased \ - -warnposix \ - +charindex \ - -kepttrans \ - -unqualifiedtrans \ - +matchanyintegral \ - +voidabstract \ - -nullassign \ - -unrecog \ - -casebreak \ - -retvalbool \ - -retvalother \ - -mayaliasunique \ - -realcompare \ - -observertrans \ - -abstract \ - -statictrans \ - -castfcnptr - #standard rules -default: all %.o: %.c $(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) @@ -192,7 +101,7 @@ test: all @ ./$(TESTSUITE) clean: - rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe + rm -rf *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe gm-qcc.tgz ./cov-int splint: @ splint $(SPLINTFLAGS) *.c *.h @@ -204,8 +113,14 @@ gource-record: @ gource $(GOURCEFLAGS) -o - | ffmpeg $(FFMPEGFLAGS) gource.mp4 depend: - @makedepend -Y -w 65536 2> /dev/null \ - $(subst .o,.c,$(DEPS)) + @ makedepend -Y -w 65536 2> /dev/null $(subst .o,.c,$(DEPS)) + + +coverity: + @cov-build --dir cov-int $(MAKE) + @tar czf gm-qcc.tgz cov-int + @rm -rf cov-int + @echo gm-qcc.tgz generated, submit for analysis #install rules install: install-gmqcc install-qcvm install-gmqpak install-doc @@ -224,28 +139,22 @@ install-doc: install -m644 doc/qcvm.1 $(DESTDIR)$(MANDIR)/man1/ install -m644 doc/gmqpak.1 $(DESTDIR)$(MANDIR)/man1/ -uninstall: - rm -f $(DESTDIR)$(BINDIR)/gmqcc - rm -f $(DESTDIR)$(BINDIR)/qcvm - rm -f $(DESTDIR)$(BINDIR)/gmqpak - rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqcc.1 - rm -f $(DESTDIR)$(MANDIR)/man1/doc/qcvm.1 - rm -f $(DESTDIR)$(MANDIR)/man1/doc/gmqpak.1 - # DO NOT DELETE util.o: gmqcc.h opts.def -code.o: gmqcc.h opts.def -ast.o: gmqcc.h opts.def ast.h ir.h -ir.o: gmqcc.h opts.def ir.h +fs.o: gmqcc.h opts.def conout.o: gmqcc.h opts.def -ftepp.o: gmqcc.h opts.def lexer.h opts.o: gmqcc.h opts.def -fs.o: gmqcc.h opts.def -utf8.o: gmqcc.h opts.def -correct.o: gmqcc.h opts.def pak.o: gmqcc.h opts.def +stat.o: gmqcc.h opts.def test.o: gmqcc.h opts.def main.o: gmqcc.h opts.def lexer.h lexer.o: gmqcc.h opts.def lexer.h -parser.o: gmqcc.h opts.def lexer.h ast.h ir.h intrin.h +parser.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h intrin.h +code.o: gmqcc.h opts.def +ast.o: gmqcc.h opts.def ast.h ir.h parser.h lexer.h +ir.o: gmqcc.h opts.def ir.h +ftepp.o: gmqcc.h opts.def lexer.h +utf8.o: gmqcc.h opts.def +correct.o: gmqcc.h opts.def +fold.o: ast.h ir.h gmqcc.h opts.def parser.h lexer.h