[Scummvm-cvs-logs] CVS: scummvm/base version.h,NONE,1.1 main.cpp,1.33,1.34 gameDetector.cpp,1.67,1.68 engine.h,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1820/base

Modified Files:
	main.cpp gameDetector.cpp engine.h 
Added Files:
	version.h 
Log Message:
Modified version of patch #892795 (Let scumvm -v show supported libs)

--- NEW FILE: version.h ---
/* ScummVM - Scumm Interpreter
 * Copyright (C) 2002-2004 The ScummVM project
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 * $Header: /cvsroot/scummvm/scummvm/base/version.h,v 1.1 2004/02/09 01:27:26 fingolfin Exp $
 */

#ifndef VERSION_H
#define VERSION_H

extern const char *gScummVMVersion;		// e.g. "0.4.1"
extern const char *gScummVMBuildDate;	// e.g. "2003-06-24"
extern const char *gScummVMFullVersion;	// e.g. "ScummVM 0.4.1 (2003-06-24)"
extern const char *gScummVMFeatures; 	// e.g. "ALSA MPEG2 zLib"

#endif

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- main.cpp	7 Feb 2004 04:53:59 -0000	1.33
+++ main.cpp	9 Feb 2004 01:27:26 -0000	1.34
@@ -32,6 +32,7 @@
 #include "base/engine.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"
+#include "base/version.h"
 #include "common/config-manager.h"
 #include "common/scaler.h"	// For GFX_NORMAL
 #include "common/timer.h"
@@ -85,7 +86,31 @@
 const char *gScummVMVersion = "0.5.7cvs";
 const char *gScummVMBuildDate = __DATE__ " " __TIME__;
 const char *gScummVMFullVersion = "ScummVM 0.5.7cvs (" __DATE__ " " __TIME__ ")";
+const char *gScummVMFeatures = 
+#ifdef USE_VORBIS
+	"Vorbis "
+#endif
+
+#ifdef USE_FLAC
+	"FLAC "
+#endif
+
+#ifdef USE_MAD
+	"MP3 "
+#endif
 
+#ifdef USE_ALSA
+	"ALSA "
+#endif
+
+#ifdef USE_ZLIB
+	"zLib "
+#endif
+
+#ifdef USE_MPEG2
+	"MPEG2 "
+#endif
+	;	
 
 #if defined(WIN32) && defined(NO_CONSOLE)
 #include <cstdio>

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gameDetector.cpp	7 Feb 2004 04:53:59 -0000	1.67
+++ gameDetector.cpp	9 Feb 2004 01:27:26 -0000	1.68
@@ -25,6 +25,7 @@
 #include "base/engine.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"
+#include "base/version.h"
 
 #include "common/config-manager.h"
 #include "common/scaler.h"	// Only for gfx_modes
@@ -371,6 +372,7 @@
 
 			DO_OPTION_CMD('v', "version")
 				printf("%s\n", gScummVMFullVersion);
+				printf("Features compiled in: %s\n", gScummVMFeatures);
 				exit(0);
 			END_OPTION
 

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- engine.h	6 Jan 2004 12:45:27 -0000	1.10
+++ engine.h	9 Feb 2004 01:27:27 -0000	1.11
@@ -25,10 +25,6 @@
 #include "common/str.h"
 #include "common/system.h"
 
-extern const char *gScummVMVersion;		// e.g. "0.4.1"
-extern const char *gScummVMBuildDate;	// e.g. "2003-06-24"
-extern const char *gScummVMFullVersion;	// e.g. "ScummVM 0.4.1 (2003-06-24)"
-
 class SoundMixer;
 class Timer;
 
@@ -61,4 +57,3 @@
 extern Engine *g_engine;
 
 #endif
-