X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=eee0d49717b0b5d68f43075ef309691c298bc769;hp=6ba6a3474054a32c4e75b5ebbeb7b50d639ee790;hb=3b4a5667ea8b1b7aa8a10734c57c02d1561fcdd7;hpb=a622d5163b9852c66d8399e05e5731d3a538d43b

diff --git a/Makefile b/Makefile
index 6ba6a34..eee0d49 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,11 @@ 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
@@ -55,6 +59,7 @@ ifneq ("$(CYGWIN)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 ifneq ("$(MINGW)", "")
 	#nullify the common variables that
@@ -67,6 +72,7 @@ ifneq ("$(MINGW)", "")
 	GMQCC     = gmqcc.exe
 	TESTSUITE = testsuite.exe
 	PAK       = gmqpak.exe
+	CFLAGS   += -DNVALGRIND
 else
 	QCVM      = qcvm
 	GMQCC     = gmqcc
@@ -76,8 +82,8 @@ endif
 endif
 
 #standard rules
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) 
+c.o:
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 
 exec-standalone.o: exec.c
 	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -DQCVM_EXECUTOR=1