[Scummvm-cvs-logs] SF.net SVN: scummvm:[43846] scummvm/trunk

[Kirben at users.sourceforge.net]

Revision: 43846
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43846&view=rev
Author:   Kirben
Date:     2009-08-31 01:52:16 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Revert revision 43845, to keep configure options for games and game engines clear and consistent.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=43845&view=rev

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/engines/engines.mk
    scummvm/trunk/engines/groovie/detection.cpp

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-08-31 01:25:04 UTC (rev 43845)
+++ scummvm/trunk/configure	2009-08-31 01:52:16 UTC (rev 43846)
@@ -84,7 +84,8 @@
 add_engine cruise "Cinematique evo 2" yes
 add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
-add_engine groovie "Groovie" yes
+add_engine groovie "Groovie" yes "groovie2"
+add_engine groovie2 "Groovie 2 games" no
 add_engine igor "Igor: Objective Uikokahonia" no
 add_engine kyra "Legend of Kyrandia" yes "lol"
 add_engine lol "Lands of Lore" no
@@ -126,7 +127,6 @@
 _build_hq_scalers=yes
 _build_scalers=yes
 _indeo3=auto
-_unsupported=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -589,7 +589,6 @@
 Game engines:
   --enable-all-engines     enable all engines
   --disable-all-engines    disable all engines
-  --enable-unsupported     enable unsupported games (still in development)
 $engines_help
 Optional Features:
   --disable-debug          disable building with debugging symbols
@@ -677,8 +676,6 @@
 	--enable-mpeg2)           _mpeg2=yes      ;;
 	--disable-indeo3)         _indeo3=no      ;;
 	--enable-indeo3)          _indeo3=yes     ;;
-	--disable-unsupported)    _unsupported=no ;;
-	--enable-unsupported)     _unsupported=yes ;;
 	--disable-fluidsynth)     _fluidsynth=no  ;;
 	--enable-readline)        _readline=yes   ;;
 	--disable-readline)       _readline=no    ;;
@@ -1760,15 +1757,6 @@
 add_to_config_mk_if_yes "$_indeo3" 'USE_INDEO3 = 1'
 
 #
-# Check whether to enable the unsupported games
-#
-if test "$_unsupported" = no ; then
-	_def_unsupported='#undef ENABLE_UNSUPPORTED_GAMES'
-else
-	_def_unsupported='#define ENABLE_UNSUPPORTED_GAMES'
-fi
-
-#
 # Check for math lib
 #
 cat > $TMPC << EOF
@@ -2128,10 +2116,6 @@
 	echo_n ", Indeo3 decoder"
 fi
 
-if test "$_unsupported" = yes ; then
-	echo_n ", unsupported games"
-fi
-
 if test "$_text_console" = yes ; then
 	echo_n ", text console"
 fi
@@ -2367,7 +2351,6 @@
 $_def_mt32emu
 $_def_indeo3
 $_def_16bit
-$_def_unsupported
 
 /* Plugin settings */
 $_def_plugin

Modified: scummvm/trunk/engines/engines.mk
===================================================================
--- scummvm/trunk/engines/engines.mk	2009-08-31 01:25:04 UTC (rev 43845)
+++ scummvm/trunk/engines/engines.mk	2009-08-31 01:52:16 UTC (rev 43846)
@@ -49,7 +49,11 @@
 ifdef ENABLE_GROOVIE
 DEFINES += -DENABLE_GROOVIE=$(ENABLE_GROOVIE)
 MODULES += engines/groovie
+
+ifdef ENABLE_GROOVIE2
+DEFINES += -DENABLE_GROOVIE2
 endif
+endif
 
 ifdef ENABLE_IGOR
 DEFINES += -DENABLE_IGOR=$(ENABLE_IGOR)

Modified: scummvm/trunk/engines/groovie/detection.cpp
===================================================================
--- scummvm/trunk/engines/groovie/detection.cpp	2009-08-31 01:25:04 UTC (rev 43845)
+++ scummvm/trunk/engines/groovie/detection.cpp	2009-08-31 01:52:16 UTC (rev 43846)
@@ -34,7 +34,7 @@
 	// Games
 	{"t7g", "The 7th Guest"},
 
-#ifdef ENABLE_UNSUPPORTED_GAMES
+#ifdef ENABLE_GROOVIE2
 	{"11h", "The 11th Hour: The sequel to The 7th Guest"},
 	{"clandestiny", "Clandestiny"},
 	{"unclehenry", "Uncle Henry's Playhouse"},
@@ -82,7 +82,7 @@
 		kGroovieT7G, 0
 	},
 
-#ifdef ENABLE_UNSUPPORTED_GAMES
+#ifdef ENABLE_GROOVIE2
 	// The 11th Hour DOS English
 	{
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.