X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=65cd4ed2ad15779bc8861b45caad06a79471c958;hp=53ead02dbd0448d5a0fcd18fcc4f9217c82aec70;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=92b6a44481d43254055576a02ce4e335eeab12e9

diff --git a/src/main.c b/src/main.c
index 53ead02d..65cd4ed2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* main.c                                                   *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// main.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 
@@ -5580,6 +5578,7 @@ static void print_usage()
 	 "  -n, --network                    network multiplayer game\n"
 	 "      --serveronly                 only start network server\n"
 	 "  -v, --verbose                    verbose mode\n"
+	 "  -V, --version                    show program version\n"
 	 "      --debug                      display debugging information\n"
 	 "      --debug-x11-sync             enable X11 synchronous mode\n"
 	 "  -e, --execute COMMAND            execute batch COMMAND\n"
@@ -5600,30 +5599,57 @@ static void print_usage()
 	 program.command_basename);
 }
 
-int main(int argc, char *argv[])
+static void print_version()
 {
-#if 1
-  InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
-		  PROGRAM_TITLE_STRING, ICON_TITLE_STRING,
-		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
-		  MSDOS_POINTER_FILENAME,
-		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
-#else
-  char *window_title_string = getWindowTitleString();
+  printf("%s %d.%d.%d.%d\n",
+	 PROGRAM_TITLE_STRING,
+	 PROGRAM_VERSION_MAJOR,
+	 PROGRAM_VERSION_MINOR,
+	 PROGRAM_VERSION_PATCH,
+	 PROGRAM_VERSION_BUILD);
+
+  if (options.debug)
+  {
+    SDL_version sdl_version;
+
+    SDL_VERSION(&sdl_version);
+    printf("- SDL %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+
+    SDL_IMAGE_VERSION(&sdl_version);
+    printf("- SDL_image %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
 
+    SDL_MIXER_VERSION(&sdl_version);
+    printf("- SDL_mixer %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+
+    SDL_NET_VERSION(&sdl_version);
+    printf("- SDL_net %d.%d.%d\n",
+	   sdl_version.major,
+	   sdl_version.minor,
+	   sdl_version.patch);
+  }
+}
+
+int main(int argc, char *argv[])
+{
   InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
-		  PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING,
-		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
-		  MSDOS_POINTER_FILENAME,
-		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
-#endif
+		  PROGRAM_TITLE_STRING, ICON_TITLE_STRING, SDL_ICON_FILENAME,
+		  COOKIE_PREFIX, GAME_VERSION_ACTUAL);
 
   InitWindowTitleFunction(getWindowTitleString);
   InitExitMessageFunction(DisplayExitMessage);
   InitExitFunction(CloseAllAndExit);
   InitPlatformDependentStuff();
 
-  GetOptions(argv, print_usage);
+  GetOptions(argv, print_usage, print_version);
   OpenAll();
 
   EventLoop();