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

[Kirben at users.sourceforge.net]

Revision: 43843
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43843&view=rev
Author:   Kirben
Date:     2009-08-31 00:39:30 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Add configure option for Groovie 2 games.

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-30 23:57:43 UTC (rev 43842)
+++ scummvm/trunk/configure	2009-08-31 00:39:30 UTC (rev 43843)
@@ -77,7 +77,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

Modified: scummvm/trunk/engines/engines.mk
===================================================================
--- scummvm/trunk/engines/engines.mk	2009-08-30 23:57:43 UTC (rev 43842)
+++ scummvm/trunk/engines/engines.mk	2009-08-31 00:39:30 UTC (rev 43843)
@@ -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-30 23:57:43 UTC (rev 43842)
+++ scummvm/trunk/engines/groovie/detection.cpp	2009-08-31 00:39:30 UTC (rev 43843)
@@ -30,13 +30,11 @@
 
 namespace Groovie {
 
-//#define GROOVIE_EXPERIMENTAL
-
 static const PlainGameDescriptor groovieGames[] = {
 	// Games
 	{"t7g", "The 7th Guest"},
 
-#ifdef GROOVIE_EXPERIMENTAL
+#ifdef ENABLE_GROOVIE2
 	{"11h", "The 11th Hour: The sequel to The 7th Guest"},
 	{"clandestiny", "Clandestiny"},
 	{"unclehenry", "Uncle Henry's Playhouse"},
@@ -84,7 +82,7 @@
 		kGroovieT7G, 0
 	},
 
-#ifdef GROOVIE_EXPERIMENTAL
+#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.