libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 14:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r43846
This commit is contained in:
Travis Howell 2009-08-31 01:52:16 +00:00
parent c6e84919c8
commit 4b43f63281
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -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 ;;
@ -1759,15 +1756,6 @@ else
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
#
@ -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

4
engines/engines.mk
View File

@ -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

4
engines/groovie/detection.cpp
View File

@ -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
{
{