aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOystein Eftevaag2009-03-21 21:48:44 +0000
committerOystein Eftevaag2009-03-21 21:48:44 +0000
commit0c5959ce8a946c5a98da86d362cbba555e3198e0 (patch)
tree4f0df41a0cb08726a88a04e837efde1dce0f4250
parent0ce597db80bf76124d41649cf9e7ab5a1746c578 (diff)
downloadscummvm-rg350-0c5959ce8a946c5a98da86d362cbba555e3198e0.tar.gz
scummvm-rg350-0c5959ce8a946c5a98da86d362cbba555e3198e0.tar.bz2
scummvm-rg350-0c5959ce8a946c5a98da86d362cbba555e3198e0.zip
Updated iphone/osx build rules a bit, to make them more consistent
svn-id: r39600
-rwxr-xr-xconfigure12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure b/configure
index e11d54076c..b7b2ef525f 100755
--- a/configure
+++ b/configure
@@ -776,10 +776,6 @@ i586-mingw32msvc)
_host_os=mingw32msvc
_host_cpu=i586
;;
-iphone)
- _host_os=iphone
- _host_cpu=arm
- ;;
neuros)
_host_os=linux
_host_cpu=arm
@@ -1050,7 +1046,7 @@ case $_host_os in
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 @@ if test -n "$_host"; then
bfin*)
_need_memalign=yes
;;
- *darwin*)
+ i686-darwin*|ppc-darwin*)
_ranlib=$_host-ranlib
_strip=$_host-strip
;;
@@ -1190,7 +1186,7 @@ if test -n "$_host"; then
_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 @@ if test -n "$_host"; then
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"