From d8b7977fe9791fdddc7e3afd655c506a55a0c428 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Mon, 27 Feb 2006 21:05:23 +0000 Subject: * Can't use upgrades while dead anymore (not that you could before, but you'd get console messages) * Added build option BUILD_MASTER_SERVER --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Makefile') 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 -- cgit