[Scummvm-cvs-logs] CVS: scummvm configure,1.106,1.107
Max Horn
fingolfin at users.sourceforge.net
Thu Dec 16 14:06:04 CET 2004
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20298
Modified Files:
configure
Log Message:
Patch #1086705 (RISC OS cross compiling support)
Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- configure 6 Nov 2004 01:41:29 -0000 1.106
+++ configure 16 Dec 2004 22:05:45 -0000 1.107
@@ -2,7 +2,7 @@
#
# Some things this script could/should do when finished
#
-# * detect whether its a GNU compiler or not (for compiler settings)
+# * detect whether it's a GNU compiler or not (for compiler settings)
# * command line options to...
# - override the host settings (for cross compiles
# - whether to do a debug build (with -g) or an optimized build (-O3 etc.)
@@ -412,15 +412,22 @@
CXXFLAGS="$CXXFLAGS $DEBFLAGS"
-if test "$_host" = "linupy"; then
+case $_host in
+linupy)
_host_os=linux
_host_cpu=arm
-else
- guessed_host=`$_srcdir/config.guess`
+ ;;
+arm-riscos-aof)
+ _host_os=riscos
+ _host_cpu=arm
+ ;;
+*)
+ guessed_host=`$_srcdir/config.guess`
_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
_host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
_host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-fi
+ ;;
+esac
#
# Determine extension used for executables
@@ -429,6 +436,9 @@
mingw* | cygwin*)
EXEEXT=".exe"
;;
+arm-riscos-aof)
+ EXEEXT=",ff8"
+ ;;
*)
EXEEXT=""
;;
@@ -482,6 +492,10 @@
cxx_version="$cxx_version, ok"
cxx_verc_fail=no
;;
+ 3_4)
+ _cxx_major=3
+ _mxx_minor=4
+ ;;
'not found')
cxx_verc_fail=yes
;;
@@ -570,7 +584,7 @@
if test -n "$_host"; then
# Cross-compiling mode - add your target here if needed
case "$_host" in
- linupy)
+ linupy|arm-riscos-aof)
echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
DEFINES="$DEFINES -DUNIX"
_def_endianness='#define SCUMM_LITTLE_ENDIAN'
More information about the Scummvm-git-logs
mailing list