diff options
| author | Travis Howell | 2009-08-31 01:52:16 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-08-31 01:52:16 +0000 |
| commit | 4b43f6328130e6ae4636d8508ae613c13ae97991 (patch) | |
| tree | 4d7bc9cb8b3f806ed63839db70a2748696ea8bca | |
| parent | c6e84919c8461db4eb3eb53db6ac4f65ed75101d (diff) | |
| download | scummvm-rg350-4b43f6328130e6ae4636d8508ae613c13ae97991.tar.gz scummvm-rg350-4b43f6328130e6ae4636d8508ae613c13ae97991.tar.bz2 scummvm-rg350-4b43f6328130e6ae4636d8508ae613c13ae97991.zip | |
Revert revision 43845, to keep configure options for games and game engines clear and consistent.
svn-id: r43846
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | engines/engines.mk | 4 | ||||
| -rw-r--r-- | engines/groovie/detection.cpp | 4 |
3 files changed, 8 insertions, 21 deletions
@@ -84,7 +84,8 @@ add_engine cine "Cinematique evo 1" yes 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 @@ _mt32emu=yes _build_hq_scalers=yes _build_scalers=yes _indeo3=auto -_unsupported=no # Default vkeybd/keymapper options _vkeybd=no _keymapper=no @@ -589,7 +589,6 @@ Special configuration feature: 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 @@ for ac_option in $@; do --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 @@ fi 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 @@ if test "$_indeo3" = yes ; then 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_text_console $_def_mt32emu $_def_indeo3 $_def_16bit -$_def_unsupported /* Plugin settings */ $_def_plugin diff --git a/engines/engines.mk b/engines/engines.mk index b73f45b8e6..acda075b46 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -49,6 +49,10 @@ endif ifdef ENABLE_GROOVIE DEFINES += -DENABLE_GROOVIE=$(ENABLE_GROOVIE) MODULES += engines/groovie + +ifdef ENABLE_GROOVIE2 +DEFINES += -DENABLE_GROOVIE2 +endif endif ifdef ENABLE_IGOR diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 6b8d3862e8..f09308b361 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -34,7 +34,7 @@ static const PlainGameDescriptor groovieGames[] = { // 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 @@ static const GroovieGameDescription gameDescriptions[] = { kGroovieT7G, 0 }, -#ifdef ENABLE_UNSUPPORTED_GAMES +#ifdef ENABLE_GROOVIE2 // The 11th Hour DOS English { { |