[Scummvm-cvs-logs] SF.net SVN: scummvm:[43578] scummvm/trunk/configure

upthorn at users.sourceforge.net upthorn at users.sourceforge.net
Fri Aug 21 11:43:31 CEST 2009


Revision: 43578
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43578&view=rev
Author:   upthorn
Date:     2009-08-21 09:43:30 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
fixed configure script from botched conflict resolution in r43577

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-08-21 09:37:51 UTC (rev 43577)
+++ scummvm/trunk/configure	2009-08-21 09:43:30 UTC (rev 43578)
@@ -110,7 +110,8 @@
 _zlib=auto
 _mpeg2=no
 _fluidsynth=auto
-_16bit=yes_readline=auto
+_16bit=yes
+_readline=auto
 # Default option behaviour yes/no
 _text_console=no
 _mt32emu=yes
@@ -637,6 +638,8 @@
 
 for ac_option in $@; do
 	case "$ac_option" in
+	--enable-16bit)           _16bit=yes      ;;
+	--disable-16bit)          _16bit=no       ;;
 	--disable-hq-scalers)     _build_hq_scalers=no ;;
 	--disable-scalers)        _build_scalers=no ;;
 	--enable-alsa)            _alsa=yes       ;;
@@ -1647,6 +1650,11 @@
 add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1'
 
 #
+# Check whether 16bit color support is requested
+#
+add_to_config_mk_if_yes "$_16bit" 'ENABLE_RGB_COLOR = 1'
+
+#
 # Check whether to enable the (hq) scalers
 #
 add_to_config_mk_if_no $_build_hq_scalers   'DISABLE_HQ_SCALERS = 1'
@@ -1996,6 +2004,10 @@
 	echo_n ", assembly routines"
 fi
 
+if test "$_16bit" = yes ; then
+	echo_n ", 16bit color"
+fi
+
 if test "$_build_hq_scalers" = yes ; then
 	echo_n ", HQ scalers"
 fi


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