diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-11 17:35:56 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-11 17:35:56 -0400 |
| commit | 30d9616ef6d9e0f6e5bccaacf4446854ceb757be (patch) | |
| tree | f402138c7310cc6660c92b39451f70f754c004b8 /crawl-ref/source/Makefile | |
| parent | c3be324a4c906792aa923846f2862ae6d9a0f5e9 (diff) | |
| download | crawl-ref-30d9616ef6d9e0f6e5bccaacf4446854ceb757be.tar.gz crawl-ref-30d9616ef6d9e0f6e5bccaacf4446854ceb757be.zip | |
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.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 4 |
1 files 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 |