diff options
author | 2016-06-10 01:27:00 +1000 | |
---|---|---|
committer | 2016-06-10 01:27:12 +1000 | |
commit | bd4f90db2e6617c2556535d2ebc04bb1bc4a8f51 (patch) | |
tree | cf0f0264cbcab3f177d16f708cd97c9a7148d797 /makefile | |
parent | 15fdafadd2721d16d28bfb7573a3a37ee5beeb00 (diff) |
Fix with cmd.exe shell
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -900,7 +900,11 @@ ifeq ($(wildcard .git/*),) IGNORE_GIT := 1 endif -OLD_GIT_VERSION := $(file <$(GENDIR)/git_desc) +ifeq (posix,$(SHELLTYPE)) +OLD_GIT_VERSION := $(shell cat $(GENDIR)/git_desc 2> /dev/null) +else +OLD_GIT_VERSION := $(shell cat $(GENDIR)/git_desc 2> NUL) +endif ifneq ($(IGNORE_GIT),1) NEW_GIT_VERSION := $(shell git describe --dirty) else @@ -1489,7 +1493,7 @@ $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo \#define BARE_BUILD_VERSION "0.174" > $@ + @echo #define BARE_BUILD_VERSION "0.174" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ |