build: Replace PACKAGE_VERSION & __DATE__ with git tag

blocksds · Oct 4, 2024 · 0c67281 · 0c67281
1 parent 8113974
commit 0c67281
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -8,10 +8,20 @@
 SOURCEDIRS	:= source
 INCLUDEDIRS	:= source
 
+# Try to find the SDK version if it wasn't already provided e.g. by the parent Makefile
+SDK_VERSION	?= $(shell git describe --tags --exact-match --dirty 2>/dev/null)
+
+# Fallback to commit hash
+ifeq ($(SDK_VERSION),)
+    VERSION_ID	:= "commit $(shell git describe --always --dirty 2>/dev/null)"
+else
+    VERSION_ID	:= "BlocksDS $(SDK_VERSION)"
+endif
+
 # Defines passed to all files
 # ---------------------------
 
-DEFINES		:= -DPACKAGE_VERSION=\"2.3.0\"
+DEFINES		:= -DVERSION_ID=\"$(VERSION_ID)\"
 
 # Libraries
 # ---------

diff --git a/source/compile_date.c b/source/compile_date.c
diff --git a/source/ndstool.cpp b/source/ndstool.cpp
@@ -60,7 +60,7 @@ unsigned int appFlags = 0x01;
 
 void Title()
 {
-	printf("Nintendo DS rom tool " PACKAGE_VERSION " - %s\nby Rafael Vuijk, Dave Murphy, Alexei Karpenko\n",CompileDate);
+	printf("Nintendo DS rom tool (" VERSION_ID ")\nby Rafael Vuijk, Dave Murphy, Alexei Karpenko\n");
 }
 
 // Argument information

diff --git a/source/ndstool.h b/source/ndstool.h
@@ -74,5 +74,3 @@ extern char *gamecode;
 extern int latency1;
 extern int latency2;
 extern unsigned int romversion;
-
-extern const char CompileDate[];