[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.85,1.86 configure,1.87,1.88

[James Brown]

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

Modified Files:
	Makefile.common configure 
Log Message:
Add Kyrandia base


Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- Makefile.common	21 Mar 2004 21:20:25 -0000	1.85
+++ Makefile.common	9 Apr 2004 12:36:05 -0000	1.86
@@ -85,6 +85,12 @@
 MODULES += saga
 endif
 
+ifdef DISABLE_KYRA
+DEFINES += -DDISABLE_KYRA
+else 
+MODULES += kyra
+endif
+
 # After the game specific modules follow the shared modules
 MODULES += \
 	gui \

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- configure	8 Apr 2004 22:54:22 -0000	1.87
+++ configure	9 Apr 2004 12:36:05 -0000	1.88
@@ -38,6 +38,7 @@
 _build_sword1=yes
 _build_sword2=yes
 _build_queen=yes
+_build_kyra=no
 _build_saga=no
 _need_memalign=no
 _build_plugins=no
@@ -212,6 +213,7 @@
   --disable-sword1         don't build the Broken Sword I engine
   --disable-sword2         don't build the Broken Sword II engine
   --disable-queen          don't build the Flight of the Amazon Queen engine
+  --enable-kyra            build the Legend of Kyrandia engine
   --enable-saga            build the SAGA engine
   --enable-plugins         build engines as loadable modules instead of
                            static linking them
@@ -261,6 +263,7 @@
       --disable-sword1)		_build_sword1=no ;;
       --disable-sword2)		_build_sword2=no ;;
       --disable-queen)		_build_queen=no ;;
+      --enable-kyra)		_build_kyra=yes ;;
       --enable-saga)		_build_saga=yes ;;
       --enable-alsa)		_alsa=yes	;;
       --disable-alsa)		_alsa=no	;;
@@ -478,6 +481,12 @@
 	_mak_queen='# DISABLE_QUEEN = 1'
 fi
 
+if test "$_build_kyra" = no ; then
+	_mak_queen='DISABLE_KYRA = 1'
+else
+	_mak_queen='# DISABLE_KYRA = 1'
+fi
+
 if test "$_build_saga" = no ; then
 	_mak_saga='DISABLE_SAGA = 1'
 else
@@ -848,6 +857,9 @@
 if test "$_build_saga" = yes ; then
   echo "    SAGA Engine"
 fi
+if test "$_build_kyra" = yes ; then
+  echo "    Legend of Kyrandia"
+fi
 echo
 
 echo_n "Backend... "
@@ -934,6 +946,7 @@
 $_mak_sword1
 $_mak_sword2
 $_mak_queen
+$_mak_kyra
 $_mak_saga
 
 INCLUDES += $INCLUDES