From 864246cc6eb58a46b669505cf4fe0aa07c6d741e Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 15 Sep 2007 15:51:40 +0000
Subject: * Merge of ioq3-r1183   + Windows dedicated console   + MSVC project 
  + Makefile tweaks

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5dddf4aa..857ea0a5 100644
--- a/Makefile
+++ b/Makefile
@@ -703,7 +703,9 @@ ifeq ($(USE_LOCAL_HEADERS),1)
 endif
 
 ifeq ($(GENERATE_DEPENDENCIES),1)
-  BASE_CFLAGS += -MMD
+  DEPEND_CFLAGS = -MMD
+else
+  DEPEND_CFLAGS =
 endif
 
 ifeq ($(USE_SVN),1)
@@ -767,13 +769,15 @@ default: release
 all: debug release
 
 debug:
-	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" V=$(V)
+	@$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
+		$(DEBUG_CFLAGS)" V=$(V)
 ifeq ($(BUILD_MASTER_SERVER),1)
 	$(MAKE) -C $(MASTERDIR) debug
 endif
 
 release:
-	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS)" V=$(V)
+	@$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(DEPEND_CFLAGS) \
+		$(RELEASE_CFLAGS)" V=$(V)
 ifeq ($(BUILD_MASTER_SERVER),1)
 	$(MAKE) -C $(MASTERDIR) release
 endif
@@ -826,7 +830,7 @@ makedirs:
 # QVM BUILD TOOLS
 #############################################################################
 
-TOOLS_CFLAGS = -O2 -Wall -Werror -fno-strict-aliasing -MMD \
+TOOLS_CFLAGS = -O2 -Wall -fno-strict-aliasing -MMD \
                -DTEMPDIR=\"$(TEMPDIR)\" -DSYSTEM=\"\" \
                -I$(Q3LCCSRCDIR) \
                -I$(LBURGDIR)
-- 
cgit