giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed version to Contiki-NG and mark the version as modified if 

the working tree has local modifications.
This commit is contained in:
Niclas Finne 2017-10-27 14:54:33 +02:00
parent a4390a3ee4
commit 3cb66a5232
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -220,13 +220,13 @@ CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection
ifndef RELSTR
RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always}
RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always --dirty}
endif
ifneq ($(RELSTR),)
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-NG-$(RELSTR)\"
else
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-3.x\"
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-NG\"
endif
### Automatic dependency generation