From 30d9616ef6d9e0f6e5bccaacf4446854ceb757be Mon Sep 17 00:00:00 2001 From: Neil Moore Date: Fri, 11 Jul 2014 17:35:56 -0400 Subject: Only define EXPERIMENTAL_BRANCH for USE_DGAMELAUNCH builds. This way we don't force a full rebuild when switching branches, unless it is necessary for online logfiles. --- crawl-ref/source/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index a09b64bc28..cb4d62234c 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -732,12 +732,12 @@ ifdef EUCLIDEAN DEFINES_L += -DEUCLIDEAN endif - +ifdef USE_DGAMELAUNCH SRC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD || echo release) ifneq ($(SRC_BRANCH),$(filter master release stone_soup-%, $(SRC_BRANCH))) DEFINES_L += -DEXPERIMENTAL_BRANCH="\"$(SRC_BRANCH)\"" endif - +endif # # Figure out the build settings for this type of build -- cgit v1.2.3-54-g00ecf