diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-15 15:51:40 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-15 15:51:40 +0000 |
| commit | 864246cc6eb58a46b669505cf4fe0aa07c6d741e (patch) | |
| tree | b6747737a78f8dc3b0bb32ce14ae1ce7f2588fdf /Makefile | |
| parent | 9b6e4553e45720183eee347fe0a8d03770ff4e6d (diff) | |
* Merge of ioq3-r1183
+ Windows dedicated console
+ MSVC project
+ Makefile tweaks
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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) |