[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.98,1.99 configure,1.120,1.121

kirben kirben at users.sourceforge.net
Sat May 14 07:08:14 CEST 2005


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv435

Modified Files:
	Makefile.common configure 
Log Message:

Add configure option to disable HE 70+ games.


Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- Makefile.common	5 Apr 2005 15:07:36 -0000	1.98
+++ Makefile.common	14 May 2005 14:06:33 -0000	1.99
@@ -39,6 +39,10 @@
 MODULES += scumm
 endif
 
+ifdef DISABLE_HE
+DEFINES += -DDISABLE_HE
+endif
+
 ifdef DISABLE_SIMON
 DEFINES += -DDISABLE_SIMON
 else

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- configure	9 May 2005 21:21:16 -0000	1.120
+++ configure	14 May 2005 14:06:33 -0000	1.121
@@ -24,6 +24,7 @@
 _mt32emu=yes
 # default option behaviour yes/no
 _build_scumm=yes
+_build_he=yes
 _build_simon=yes
 _build_sky=yes
 _build_sword1=yes
@@ -263,6 +264,7 @@
 Optional Features:
   --disable-debug          disable building with debugging symbols
   --disable-scumm          don't build the SCUMM engine
+  --disable-he             exclude HE70+ games in SCUMM engine
   --disable-simon          don't build the simon engine
   --disable-sky            don't build the Beneath a Steel Sky engine
   --disable-sword1         don't build the Broken Sword I engine
@@ -321,6 +323,7 @@
 for ac_option in $@; do
     case "$ac_option" in
       --disable-scumm)          _build_scumm=no ;;
+      --disable-he)             _build_he=no ;;
       --disable-simon)          _build_simon=no ;;
       --disable-sky)            _build_sky=no ;;
       --disable-sword1)         _build_sword1=no ;;
@@ -556,6 +559,12 @@
 	_mak_scumm='# DISABLE_SCUMM = 1'
 fi
 
+if test "$_build_he" = no ; then
+	_mak_he='DISABLE_HE = 1'
+else
+	_mak_he='# DISABLE_HE = 1'
+fi
+
 if test "$_build_simon" = no ; then
 	_mak_simon='DISABLE_SIMON = 1'
 else
@@ -1064,6 +1073,9 @@
 echo "Engines:"
 if test "$_build_scumm" = yes ; then
 	echo "    SCUMM"
+	if test "$_build_he" = yes ; then
+		echo "    SCUMM (HE70+ games)"
+	fi
 fi
 if test "$_build_simon" = yes ; then
 	echo "    Simon the Sorcerer"
@@ -1218,6 +1230,7 @@
 $_make_def_HAVE_GCC3
 $_make_def_HAVE_NASM
 $_mak_scumm
+$_mak_he
 $_mak_simon
 $_mak_sky
 $_mak_sword1





More information about the Scummvm-git-logs mailing list