X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=207e910471305915fb31ab020c3f1ef633e26185;hp=3396ec68ff088a4e6f96e9405e5401e2196a91cc;hb=641136fee3e2f589f93ad6a7b3213b0247107303;hpb=7669a99c7f03f92f78c2bfe0968b1d8789512ff5

diff --git a/Makefile b/Makefile
index 3396ec6..207e910 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +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  += -O3 -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL)
-ifneq ($(shell git describe --always 2>/dev/null),)
-    CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
-endif
-#turn on tons of warnings if clang is present
+# turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
 	CFLAGS +=                              \
@@ -17,26 +13,37 @@ ifeq ($(CC), clang)
 	    -Wno-format-nonliteral             \
 	    -Wno-disabled-macro-expansion      \
 	    -Wno-conversion                    \
-	    -Wno-missing-prototypes            \
 	    -Wno-float-equal                   \
 	    -Wno-unknown-warning-option        \
 	    -Wno-cast-align                    \
-	    -Wstrict-prototypes
+	    -Wno-assign-enum                   \
+	    -Wno-empty-body                    \
+	    -pedantic-errors
 else
-	#Tiny C Compiler doesn't know what -pedantic-errors is
-	# and instead of ignoring .. just errors.
+	ifneq ($(CC), g++)
+		CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
+	endif
+
 	ifneq ($(CC), tcc)
 		CFLAGS += -pedantic-errors
 	else
 		CFLAGS += -Wno-pointer-sign -fno-common
 	endif
-	
-	#-Wstrict-prototypes is not valid in g++
-	ifneq ($(CC), g++)
-		CFLAGS += -Wstrict-prototypes
-	endif
 endif
 
+ifneq ($(shell git describe --always 2>/dev/null),)
+	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)
+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
 #filter the list and remove duplicates which we use for make depend
@@ -54,6 +61,7 @@ ifneq ("$(CYGWIN)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
 	#nullify the common variables that
@@ -66,6 +74,7 @@ ifneq ("$(MINGW)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 	QCVM      = qcvm
 	GMQCC     = gmqcc
@@ -75,11 +84,8 @@ endif
 endif
 
 #standard rules
-%.o: %.c
-	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS)
-
-exec-standalone.o: exec.c
-	$(CC) -c $< -o $@ $(CPPFLAGS) $(CFLAGS) -DQCVM_EXECUTOR=1
+c.o:
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 
 $(QCVM): $(OBJ_X)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
@@ -100,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))
 
@@ -141,16 +143,18 @@ 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 intrin.h
+parser.o: parser.h gmqcc.h opts.def lexer.h ast.h ir.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
@@ -158,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