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

[vinterstum at users.sourceforge.net]

Revision: 39600
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39600&view=rev
Author:   vinterstum
Date:     2009-03-21 21:48:44 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Updated iphone/osx build rules a bit, to make them more consistent

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

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-21 20:24:36 UTC (rev 39599)
+++ scummvm/trunk/configure	2009-03-21 21:48:44 UTC (rev 39600)
@@ -776,10 +776,6 @@
 	_host_os=mingw32msvc
 	_host_cpu=i586
 	;;
-iphone)
-	_host_os=iphone
-	_host_cpu=arm
-	;;
 neuros)
 	_host_os=linux
 	_host_cpu=arm
@@ -1050,7 +1046,7 @@
 		LIBS="$LIBS -lmd "
 		_ranlib=:
 		;;
-	darwin*)
+	i686-darwin*|ppc-darwin*)
 		DEFINES="$DEFINES -DUNIX -DMACOSX"
 		LIBS="$LIBS -framework QuickTime -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		;;
@@ -1127,7 +1123,7 @@
 		bfin*)
 			_need_memalign=yes
 			;;
-		*darwin*)
+		i686-darwin*|ppc-darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
@@ -1190,7 +1186,7 @@
 			_ar="$_host-ar cru"
 			_ranlib=$_host-ranlib
 			;;
-		iphone)
+		arm-apple-darwin*)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
 			DEFINES="$DEFINES -DIPHONE -DUNIX -DUSE_ARM_SMUSH_ASM"
 			_endian=little
@@ -1202,6 +1198,8 @@
 			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.