From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sat, 27 Apr 2013 14:30:03 +0000 (+0200)
Subject: this should be tagged 0.2.9
X-Git-Tag: 0.2.9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=219508e478ab0e9bf0b99799c71925a4a4d49ed7;p=xonotic%2Fgmqcc.git

this should be tagged 0.2.9
---

diff --git a/gmqcc.h b/gmqcc.h
index 76be020..f09cd10 100644
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -45,16 +45,20 @@
 #define GMQCC_VERSION \
     GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
 /* Undefine the following on a release-tag: */
-#define GMQCC_VERSION_TYPE_DEVEL
+/* #define GMQCC_VERSION_TYPE_DEVEL */
 
 /* Full version string in case we need it */
-#ifdef GMQCC_GITINFO
-#    define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
-#elif defined(GMQCC_VERSION_TYPE_DEVEL)
-#    define GMQCC_DEV_VERSION_STRING "development build\n"
+#ifdef GMQCC_VERSION_TYPE_DEVEL
+#    ifdef GMQCC_GITINFO
+#        define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
+#    elif defined(GMQCC_VERSION_TYPE_DEVEL)
+#        define GMQCC_DEV_VERSION_STRING "development build\n"
+#    else
+#        define GMQCC_DEV_VERSION_STRING
+#    endif /*! GMQCC_GITINGO */
 #else
 #    define GMQCC_DEV_VERSION_STRING
-#endif /*! GMQCC_GITINGO */
+#endif
 
 #define GMQCC_STRINGIFY(x) #x
 #define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x)
diff --git a/main.c b/main.c
index 498386c..bbc685a 100644
--- a/main.c
+++ b/main.c
@@ -44,18 +44,13 @@ static ppitem  *ppems = NULL;
 static const char *app_name;
 
 static void version() {
-    con_out("GMQCC %d.%d.%d Built %s %s\n",
+    con_out("GMQCC %d.%d.%d Built %s %s\n" GMQCC_DEV_VERSION_STRING,
         GMQCC_VERSION_MAJOR,
         GMQCC_VERSION_MINOR,
         GMQCC_VERSION_PATCH,
         __DATE__,
         __TIME__
     );
-#ifdef GMQCC_GITINFO
-    con_out("git build: %s\n", GMQCC_GITINFO);
-#elif defined(GMQCC_VERION_TYPE_DEVEL)
-    con_out("development build\n");
-#endif
 }
 
 static int usage() {