Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
cc9520b7a0
1 changed files with 3 additions and 2 deletions
|
@ -46,11 +46,12 @@ ifdef SKIP_VERSION
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Generate the version.h file
|
# Generate the version.h file
|
||||||
|
VERSION_H_FLAGS :=
|
||||||
ifdef SKIP_VERSION
|
ifdef SKIP_VERSION
|
||||||
VERSION_H_FLAGS := --skip-all
|
VERSION_H_FLAGS += --skip-all
|
||||||
endif
|
endif
|
||||||
ifdef SKIP_GIT
|
ifdef SKIP_GIT
|
||||||
VERSION_H_FLAGS := --skip-git
|
VERSION_H_FLAGS += --skip-git
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Generate the board's version.h file.
|
# Generate the board's version.h file.
|
||||||
|
|
Loading…
Reference in a new issue