From 7bbd877fb5a11b3a60c1489451dd87feb54785d0 Mon Sep 17 00:00:00 2001
From: AnnaSnoeijs <anna.snoeijs@hotmail.com>
Date: Fri, 6 Jun 2025 21:31:59 +0200
Subject: [PATCH] Added git hash to version number

---
 connect4.c | 10 ++++++++--
 makefile   |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/connect4.c b/connect4.c
index 8c8bcd7..896557b 100644
--- a/connect4.c
+++ b/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
diff --git a/makefile b/makefile
index dc4c6bc..415f1f8 100644
--- a/makefile
+++ b/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)