[Scummvm-cvs-logs] SF.net SVN: scummvm:[43845] scummvm/trunk
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Mon Aug 31 03:25:04 CEST 2009
Revision: 43845
http://scummvm.svn.sourceforge.net/scummvm/?rev=43845&view=rev
Author: jvprat
Date: 2009-08-31 01:25:04 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Added the --enable-unsupported option to enable the detection of the
unsupported games, guarded by the ENABLE_UNSUPPORTED_GAMES define.
It's a generalization of r43843.
Also grouped all the engines options together in the configure help.
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:24:04 UTC (rev 43844)
+++ scummvm/trunk/configure 2009-08-31 01:25:04 UTC (rev 43845)
@@ -84,8 +84,7 @@
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 "groovie2"
-add_engine groovie2 "Groovie 2 games" no
+add_engine groovie "Groovie" yes
add_engine igor "Igor: Objective Uikokahonia" no
add_engine kyra "Legend of Kyrandia" yes "lol"
add_engine lol "Lands of Lore" no
@@ -127,6 +126,7 @@
_build_hq_scalers=yes
_build_scalers=yes
_indeo3=auto
+_unsupported=no
# Default vkeybd/keymapper options
_vkeybd=no
_keymapper=no
@@ -586,12 +586,14 @@
wince for Windows CE
psp for PlayStation Portable
+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
--enable-Werror treat warnings as errors
- --enable-all-engines enable all engines
- --disable-all-engines disable all engines
-$engines_help
--enable-plugins enable the support for dynamic plugins
--default-dynamic make plugins dynamic by default
--disable-mt32emu don't enable the integrated MT-32 emulator
@@ -675,6 +677,8 @@
--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 ;;
@@ -1756,6 +1760,15 @@
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
@@ -2115,6 +2128,10 @@
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
@@ -2350,6 +2367,7 @@
$_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:24:04 UTC (rev 43844)
+++ scummvm/trunk/engines/engines.mk 2009-08-31 01:25:04 UTC (rev 43845)
@@ -49,11 +49,7 @@
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:24:04 UTC (rev 43844)
+++ scummvm/trunk/engines/groovie/detection.cpp 2009-08-31 01:25:04 UTC (rev 43845)
@@ -34,7 +34,7 @@
// Games
{"t7g", "The 7th Guest"},
-#ifdef ENABLE_GROOVIE2
+#ifdef ENABLE_UNSUPPORTED_GAMES
{"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_GROOVIE2
+#ifdef ENABLE_UNSUPPORTED_GAMES
// The 11th Hour DOS English
{
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list