X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=bec603e5daf95db1d913fff4810e3883ec3980ae;hb=1497191e3ce1da4de07884f6fe13be3e2faaa261;hp=6ba6a3474054a32c4e75b5ebbeb7b50d639ee790;hpb=a622d5163b9852c66d8399e05e5731d3a538d43b;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index 6ba6a34..bec603e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 include include.mk
 
 UNAME  ?= $(shell uname)
-CYGWIN  = $(findstring CYGWIN,  $(UNAME))
-MINGW   = $(findstring MINGW32, $(UNAME))
+CYGWIN  = $(findstring CYGWIN, $(UNAME))
+MINGW   = $(findstring MINGW,  $(UNAME))
 
-CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing
+CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
@@ -17,6 +17,7 @@ ifeq ($(CC), clang)
 	    -Wno-float-equal                   \
 	    -Wno-unknown-warning-option        \
 	    -Wno-cast-align                    \
+	    -Wno-assign-enum                   \
 	    -pedantic-errors
 else
 	ifneq ($(CC), g++)
@@ -31,12 +32,17 @@ else
 endif
 
 ifneq ($(shell git describe --always 2>/dev/null),)
-    CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+	CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
+endif
+
+ifeq ($(shell valgrind --version 2>/dev/null),)
+	CFLAGS += -DNVALGRIND
 endif
 
 # do this last otherwise there is whitespace in the command output and
 # it makes my OCD act up
-CFLAGS += $(OPTIONAL)
+CFLAGS += $(OPTIONAL_CFLAGS)
+LDFLAGS += $(OPTIONAL_LDFLAGS)
 
 #we have duplicate object files when dealing with creating a simple list
 #for dependinces. To combat this we use some clever recrusive-make to
@@ -55,6 +61,7 @@ ifneq ("$(CYGWIN)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
 	#nullify the common variables that
@@ -67,6 +74,7 @@ ifneq ("$(MINGW)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 	QCVM      = qcvm
 	GMQCC     = gmqcc
@@ -76,11 +84,8 @@ endif
 endif
 
 #standard rules
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) 
-
-exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -DQCVM_EXECUTOR=1
+c.o:
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 
 $(QCVM): $(OBJ_X)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@@ -101,18 +106,14 @@ check: all
 test: all
 	@ ./$(TESTSUITE)
 
+strip: $(GMQCC) $(QCVM) $(TESTSUITE)
+	strip $(GMQCC)
+	strip $(QCVM)
+	strip $(TESTSUITE)
+
 clean:
 	rm -rf *.o $(GMQCC) $(QCVM) $(TESTSUITE) $(PAK) *.dat gource.mp4 *.exe gm-qcc.tgz ./cov-int
 
-splint:
-	@  splint $(SPLINTFLAGS) *.c *.h
-
-gource:
-	@ gource $(GOURCEFLAGS)
-
-gource-record:
-	@ gource $(GOURCEFLAGS) -o - | ffmpeg $(FFMPEGFLAGS) gource.mp4
-
 depend:
 	@ makedepend -Y -w 65536 2> /dev/null $(subst .o,.c,$(DEPS))
 
@@ -142,13 +143,15 @@ install-doc:
 
 # DO NOT DELETE
 
-util.o: gmqcc.h opts.def
-fs.o: gmqcc.h opts.def
-conout.o: gmqcc.h opts.def
+ansi.o: platform.h gmqcc.h opts.def
+util.o: gmqcc.h opts.def platform.h
+hash.o: gmqcc.h opts.def
+stat.o: gmqcc.h opts.def
+fs.o: gmqcc.h opts.def platform.h
 opts.o: gmqcc.h opts.def
+conout.o: gmqcc.h opts.def
 pak.o: gmqcc.h opts.def
-stat.o: gmqcc.h opts.def
-test.o: gmqcc.h opts.def
+test.o: gmqcc.h opts.def platform.h
 main.o: gmqcc.h opts.def lexer.h
 lexer.o: gmqcc.h opts.def lexer.h
 parser.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h
@@ -159,3 +162,5 @@ 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
+intrin.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.h
+exec.o: gmqcc.h opts.def