Added git hash to version number
This commit is contained in:
parent
be33c08738
commit
7bbd877fb5
2 changed files with 16 additions and 3 deletions
10
connect4.c
10
connect4.c
|
|
@ -26,10 +26,16 @@
|
|||
#include "types.h"
|
||||
#include "ui.h"
|
||||
|
||||
#define VERSION 0.1.0
|
||||
#define VERSION 0.1.1
|
||||
|
||||
#ifndef GITHASH
|
||||
#define FULLVERSION VERSION
|
||||
#else
|
||||
#define FULLVERSION VERSION~git.GITHASH
|
||||
#endif
|
||||
|
||||
#define VERSIONSTRING \
|
||||
"AnnaConnect version "XSTR(VERSION)", Copyright (C) Anna Snoeijs\n"
|
||||
"AnnaConnect version "XSTR(FULLVERSION)", Copyright (C) Anna Snoeijs\n"
|
||||
|
||||
// The LISENCE file
|
||||
// Not null-terminated so need pointers for both start and end
|
||||
|
|
|
|||
9
makefile
9
makefile
|
|
@ -6,6 +6,8 @@ FLAGS += -Wall
|
|||
FLAGS += -Wextra
|
||||
FLAGS += -Werror
|
||||
|
||||
GITFLAG = -D'GITHASH=$(shell git rev-parse --short=1 HEAD)'
|
||||
|
||||
OBJDIR = obj
|
||||
OUTDIR = out
|
||||
|
||||
|
|
@ -43,13 +45,18 @@ $(OUTDIR)/connect4_%.elf: $(addprefix $(OBJDIR)/,ui_%.o logic.o connect4.o LICEN
|
|||
$(OBJDIR)/LICENSE.o: LICENSE
|
||||
@echo $(MSG_LINKING) $@
|
||||
@mkdir -p $(@D)
|
||||
ld -r -b binary -o $@ $^
|
||||
ld -r -b binary -o $@ $^
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
@echo $(MSG_COMPILING) $^
|
||||
@mkdir -p $(@D)
|
||||
$(CC) -c $(FLAGS) -o $@ $^
|
||||
|
||||
$(OBJDIR)/connect4.o: connect4.c
|
||||
@echo $(MSG_COMPILING) $^
|
||||
@mkdir -p $(@D)
|
||||
$(CC) -c $(FLAGS) $(GITFLAG) -o $@ $^
|
||||
|
||||
clean:
|
||||
@echo $(MSG_CLEANING)
|
||||
@echo $(MSG_CLEANING_OBJ)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue