major cleanup of preprocessor hell

[rocksndiamonds.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index e44e8348c25a946890cb6d291dad8ef9ba398a75..955c4979f54ad64703d38f033a3e93bdfe9ad399 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -15,62 +15,26 @@
 #include "conftime.h"
 
 
-#define USE_EXTENDED_VERSION   1
-
-
 char *getCompileDateString()
 {
   return COMPILE_DATE_STRING;
 }
 
-char *getProgramReleaseVersionString()
-{
-  static char program_version_string[32];
-
-#if USE_EXTENDED_VERSION
-  sprintf(program_version_string, "%d.%d.%d.%d",
-         PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-         PROGRAM_VERSION_BUILD);
-#else
-  sprintf(program_version_string, "%d.%d.%d",
-         PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH);
-#endif
-
-  return program_version_string;
-}
-
-char *getProgramFullVersionString()
+char *getProgramVersionString()
 {
   static char program_version_string[32];
 
-#if USE_EXTENDED_VERSION
   sprintf(program_version_string, "%d.%d.%d.%d",
          PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
          PROGRAM_VERSION_BUILD);
-#else
-  sprintf(program_version_string, "%d.%d.%d-%d",
-         PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
-         PROGRAM_VERSION_BUILD);
-#endif
 
   return program_version_string;
 }
 
-char *getProgramVersionString()
-{
-#ifdef DEBUG
-  return getProgramFullVersionString();
-#else
-  return getProgramReleaseVersionString();
-#endif
-}
-
 char *getProgramInitString()
 {
   static char *program_init_string = NULL;
 
-#if 1
-  // do not display compile target anymore, as it is almost always "SDL" now
   if (program_init_string == NULL)
   {
     program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 +
@@ -79,24 +43,12 @@ char *getProgramInitString()
     sprintf(program_init_string, "%s %s",
            PROGRAM_TITLE_STRING, getProgramVersionString());
   }
-#else
-  if (program_init_string == NULL)
-  {
-    program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 +
-                                        strlen(getProgramVersionString()) + 1 +
-                                        strlen(TARGET_STRING) + 1);
-
-    sprintf(program_init_string, "%s %s %s",
-           PROGRAM_TITLE_STRING, getProgramVersionString(), TARGET_STRING);
-  }
-#endif
 
   return program_init_string;
 }
 
 char *getWindowTitleString()
 {
-#if 1
   static char *window_title_string = NULL;
 
   checked_free(window_title_string);
@@ -116,25 +68,4 @@ char *getWindowTitleString()
 #endif
 
   return window_title_string;
-
-#else
-
-#ifdef DEBUG
-  static char *window_title_string = NULL;
-
-  if (window_title_string == NULL)
-  {
-    window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
-                                        strlen(getCompileDateString()) + 2 +1);
-
-    sprintf(window_title_string, "%s [%s]",
-           getProgramInitString(), getCompileDateString());
-  }
-
-  return window_title_string;
-#else
-  return getProgramInitString();
-#endif
-
-#endif
 }