From 2ad6579a35e1816961a46cdd338cfbf96ba2a352 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sat, 14 Nov 2015 14:45:19 +0000
Subject: [PATCH] Added revision number to build.

---
 makefile         | 9 +++++----
 src/defs.h       | 4 ++++
 src/game/title.c | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index c3bdcd1..d29c7ae 100644
--- a/makefile
+++ b/makefile
@@ -1,9 +1,10 @@
 PROG = tbftss
 
 VERSION = 0.3
+REVISION := $(shell git rev-list --count HEAD)
 DEBUG = 0
 
-CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DUNIX=1 -DDEBUG=$(DEBUG)
+CXXFLAGS += `sdl2-config --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DUNIX=1 -DDEBUG=$(DEBUG)
 CXXFLAGS += -DUNIX
 CXXFLAGS += $(CFLAGS) -Wall -ansi -pedantic -Werror -Wstrict-prototypes
 CXXFLAGS += -g -lefence
@@ -53,10 +54,10 @@ dist:
 	$(RM) -rf $(PROG)-$(VERSION)
 	mkdir $(PROG)-$(VERSION)
 	cp -r $(DIST_FILES) $(PROG)-$(VERSION)
-	git log --oneline master..v$(VERSION) >$(PROG)-$(VERSION)/CHANGELOG
-	tar czf $(PROG)-$(VERSION)-src.tar.gz $(PROG)-$(VERSION)
+	git log --oneline master..develop >$(PROG)-$(VERSION)/CHANGELOG
+	tar czf $(PROG)-$(VERSION).$(REVISION)-src.tar.gz $(PROG)-$(VERSION)
 	mkdir -p dist
-	mv $(PROG)-$(VERSION)-src.tar.gz dist
+	mv $(PROG)-$(VERSION).$(REVISION)-src.tar.gz dist
 	$(RM) -rf $(PROG)-$(VERSION)
 
 # cleaning everything that can be automatically recreated with "make".
diff --git a/src/defs.h b/src/defs.h
index 1e613ed..798505c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -18,6 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef REVISION
+#define REVISION 0
+#endif
+
 #define PI 3.14159265358979323846
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define MAX(a,b) (((a)>(b))?(a):(b))
diff --git a/src/game/title.c b/src/game/title.c
index 7ead082..daf64df 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -172,7 +172,7 @@ static void draw(void)
 	blit(pandoranWar, SCREEN_WIDTH / 2, 110, 1);
 	
 	drawText(10, SCREEN_HEIGHT - 25, 14, TA_LEFT, colors.white, "Copyright Parallel Realities, 2015");
-	drawText(SCREEN_WIDTH - 10, SCREEN_HEIGHT - 25, 14, TA_RIGHT, colors.white, "Version %.2f", VERSION);
+	drawText(SCREEN_WIDTH - 10, SCREEN_HEIGHT - 25, 14, TA_RIGHT, colors.white, "Version %.2f.%d", VERSION, REVISION);
 	
 	if (!showingOptions)
 	{