# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1396206883 -10800
# Node ID 4ef6734f09ff8909a6e2c83807d52e8cffc9c71c
# Parent  b716d1902cd487d8668211d45b1bae9281809601
- only use the git description if it's available and if making a debug build, use short-form version number otherwise

diff -r b716d1902cd4 -r 4ef6734f09ff src/main.cpp
--- a/src/main.cpp	Sun Mar 30 22:10:29 2014 +0300
+++ b/src/main.cpp	Sun Mar 30 22:14:43 2014 +0300
@@ -198,6 +198,7 @@
 //
 String versionString (bool longform)
 {
+#if defined(GIT_DESCRIPTION) && defined (DEBUG)
 	String tag (GIT_DESCRIPTION);
 	String version = tag;
 
@@ -205,4 +206,9 @@
 		version += "-" + String (GIT_HASH).mid (0, 8);
 
 	return version;
+#elif VERSION_PATCH != 0
+	return format ("%1.%2.%3", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+#else
+	return format ("%1.%2", VERSION_MAJOR, VERSION_MINOR);
+#endif
 }