diff options
author | Max Horn | 2009-03-22 16:46:45 +0000 |
---|---|---|
committer | Max Horn | 2009-03-22 16:46:45 +0000 |
commit | 8bb60d62000ad549dfc65e9acc0ec7fcba667815 (patch) | |
tree | 7c491f78f36e7922e6e8a52b5a9803eee9f919b0 /configure | |
parent | 2b8140d7658705a6f032e6d7969de2505fda88ab (diff) | |
download | scummvm-rg350-8bb60d62000ad549dfc65e9acc0ec7fcba667815.tar.gz scummvm-rg350-8bb60d62000ad549dfc65e9acc0ec7fcba667815.tar.bz2 scummvm-rg350-8bb60d62000ad549dfc65e9acc0ec7fcba667815.zip |
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
svn-id: r39610
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -761,6 +761,10 @@ i586-mingw32msvc) _host_os=mingw32msvc _host_cpu=i586 ;; +iphone) + _host_os=iphone + _host_cpu=arm + ;; neuros) _host_os=linux _host_cpu=arm @@ -1134,7 +1138,7 @@ if test -n "$_host"; then bfin*) _need_memalign=yes ;; - i686-apple-darwin*|ppc-apple-darwin*) + *darwin*) _ranlib=$_host-ranlib _strip=$_host-strip ;; @@ -1197,7 +1201,7 @@ if test -n "$_host"; then _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 @@ 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" |