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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Mar 22 17:46:46 CET 2009


Revision: 39610
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39610&view=rev
Author:   fingolfin
Date:     2009-03-22 16:46:45 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
Reverted vinterstum's 'unification' of iPhone and Mac OS X configure code. There is no reliable way to distinguish iPhone OS X and 'regular' Mac OS X via the host type only

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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-22 15:30:42 UTC (rev 39609)
+++ scummvm/trunk/configure	2009-03-22 16:46:45 UTC (rev 39610)
@@ -761,6 +761,10 @@
 	_host_os=mingw32msvc
 	_host_cpu=i586
 	;;
+iphone)
+	_host_os=iphone
+	_host_cpu=arm
+	;;
 neuros)
 	_host_os=linux
 	_host_cpu=arm
@@ -1134,7 +1138,7 @@
 		bfin*)
 			_need_memalign=yes
 			;;
-		i686-apple-darwin*|ppc-apple-darwin*)
+		*darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
@@ -1197,7 +1201,7 @@
 			_ar="$_host-ar cru"
 			_ranlib=$_host-ranlib
 			;;
-		arm-apple-darwin*)
+		iphone)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
 			DEFINES="$DEFINES -DIPHONE -DUNIX -DUSE_ARM_SMUSH_ASM"
 			_endian=little
@@ -1209,8 +1213,6 @@
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			_backend="iphone"
 			_build_hq_scalers="no"
-			_ranlib=$_host-ranlib
-			_strip=$_host-strip
 			;;
 		dreamcast)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"


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