X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=include.mk;h=1f90111aa332e63344ad8f30b20f51f2cf291e9a;hp=f95ff7cb697c91c82633ec0af99368bbca97834f;hb=3f4659b5d5a4827602fcbddd322ac1afebd5ccfe;hpb=82afdb1e2cc2b9171ac79ef45b1d3743c590f0ec

diff --git a/include.mk b/include.mk
index f95ff7c..1f90111 100644
--- a/include.mk
+++ b/include.mk
@@ -1,11 +1,13 @@
 # default directories and paths
 DESTDIR :=
-OPTIONAL:=
 PREFIX  := /usr/local
 BINDIR  := $(PREFIX)/bin
 DATADIR := $(PREFIX)/share
 MANDIR  := $(DATADIR)/man
 
+# default flags
+CFLAGS  += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes -O2
+
 # compiler
 CC      ?= clang
 
@@ -14,13 +16,17 @@ LDFLAGS +=
 LIBS    += -lm
 
 #common objects
-COMMON   = ansi.o util.o stat.o fs.o opts.o conout.o
+COMMON   = ansi.o util.o hash.o stat.o fs.o opts.o conout.o
+
+#optional flags
+OPTIONAL_CFLAGS  :=
+OPTIONAL_LDFLAGS :=
 
 #objects
 OBJ_C = $(COMMON) main.o lexer.o parser.o code.o ast.o ir.o ftepp.o utf8.o correct.o fold.o intrin.o
 OBJ_P = $(COMMON) pak.o
 OBJ_T = $(COMMON) test.o
-OBJ_X = $(COMMON) exec-standalone.o
+OBJ_X = $(COMMON) exec.o
 
 #gource flags
 GOURCEFLAGS =                 \
@@ -55,6 +61,7 @@ FFMPEGFLAGS=                  \
 
 #splint flags
 SPLINTFLAGS =                 \
+    -preproc                  \
     -redef                    \
     -noeffect                 \
     -nullderef                \
@@ -97,7 +104,12 @@ SPLINTFLAGS =                 \
     -observertrans            \
     -abstract                 \
     -statictrans              \
-    -castfcnptr
+    -castfcnptr               \
+    -shiftimplementation      \
+    -shiftnegative            \
+    -boolcompare              \
+    -infloops                 \
+    -sysunrecog
 
 #always the right rule
 default: all
@@ -107,17 +119,26 @@ 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
+	rm -f $(DESTDIR)$(MANDIR)/man1/gmqcc.1
+	rm -f $(DESTDIR)$(MANDIR)/man1/qcvm.1
+	rm -f $(DESTDIR)$(MANDIR)/man1/gmqpak.1
 
+#style rule
 STYLE_MATCH = \( -name '*.[ch]' -or -name '*.def' -or -name '*.qc' \)
 
-whitespace:
+# splint cannot parse the MSVC source
+SPLINT_MATCH = \( -name '*.[ch]' -and ! -name 'msvc.c' -and ! -path './doc/*' \)
+
+style:
 	find . -type f $(STYLE_MATCH) -exec sed -i 's/ *$$//' '{}' ';'
-newline:
 	find . -type f $(STYLE_MATCH) -exec sed -i -e '$$a\' '{}' ';'
-indent:
 	find . -type f $(STYLE_MATCH) -exec sed -i 's/\t/    /g' '{}' ';'
 
-style: whitespace newline indent
+splint:
+	@splint $(SPLINTFLAGS) `find . -type f $(SPLINT_MATCH)`
+
+gource:
+	@gource $(GOURCEFLAGS)
+
+gource-record:
+	@gource $(GOURCEFLAGS) -o - | ffmpeg $(FFMPEGFLAGS) gource.mp4