summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-02-27 21:05:23 +0000
committerTim Angus <tim@ngus.net>2006-02-27 21:05:23 +0000
commitd8b7977fe9791fdddc7e3afd655c506a55a0c428 (patch)
tree96e416604aba3240883fde16cd0516f5b10d83d2 /Makefile
parentb8d0da94c3014753ce948f5d861ebfebb467eafe (diff)
* Can't use upgrades while dead anymore (not that you could before, but you'd
get console messages) * Added build option BUILD_MASTER_SERVER
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ca44dd6b..50330f97 100644
--- a/Makefile
+++ b/Makefile
@@ -103,6 +103,10 @@ ifndef USE_LOCAL_HEADERS
USE_LOCAL_HEADERS=1
endif
+ifndef BUILD_MASTER_SERVER
+BUILD_MASTER_SERVER=0
+endif
+
#############################################################################
BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -694,12 +698,16 @@ release: build_release
build_debug: B=$(BD)
build_debug: makedirs tools
$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)"
+ifeq ($(BUILD_MASTER_SERVER),1)
$(MAKE) -C $(MASTERDIR) debug
+endif
build_release: B=$(BR)
build_release: makedirs tools
$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)"
+ifeq ($(BUILD_MASTER_SERVER),1)
$(MAKE) -C $(MASTERDIR) release
+endif
#Build both debug and release builds
all:build_debug build_release