[Scummvm-cvs-logs] CVS: scummvm configure,1.141,1.142
Jonathan Gray
khalek at users.sourceforge.net
Sat Jan 28 19:48:01 CET 2006
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23577
Modified Files:
configure
Log Message:
Allow GCC 2.95 again as compilation is now fixed.
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- configure 28 Jan 2006 07:31:53 -0000 1.141
+++ configure 29 Jan 2006 03:47:46 -0000 1.142
@@ -557,20 +557,19 @@
fi
case $cxx_version in
-# 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
- 3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9].[0-9][-.]*|4.[0-9].[0-9]|4.[0-9].[0-9][-.]*)
_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok"
cxx_verc_fail=no
;;
# whacky beos version strings
-# 2.9-beos-991026*|2.9-beos-000224*)
-# _cxx_major=2
-# _cxx_minor=95
-# cxx_version="$cxx_version, ok"
-# cxx_verc_fail=no
-# ;;
+ 2.9-beos-991026*|2.9-beos-000224*)
+ _cxx_major=2
+ _cxx_minor=95
+ cxx_version="$cxx_version, ok"
+ cxx_verc_fail=no
+ ;;
3_4)
_cxx_major=3
_mxx_minor=4
@@ -589,7 +588,7 @@
if test "$cxx_verc_fail" = yes ; then
echo
echo "The version of your compiler is not supported at this time"
- echo "Please ensure you are using GCC >= 3.x"
+ echo "Please ensure you are using GCC >= 2.95"
exit 1
fi
More information about the Scummvm-git-logs
mailing list