aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorVincent Bénony2015-12-06 12:29:06 +0100
committerVincent Bénony2016-01-06 16:17:33 +0100
commitdcad83e05b51a268d805163d1b83feb90198b7f3 (patch)
treebe69da05a7963d5127e9727618f3789554c3f984 /configure
parent873e38372b6a8ec76f19e45e8680a064e39b53d2 (diff)
downloadscummvm-rg350-dcad83e05b51a268d805163d1b83feb90198b7f3.tar.gz
scummvm-rg350-dcad83e05b51a268d805163d1b83feb90198b7f3.tar.bz2
scummvm-rg350-dcad83e05b51a268d805163d1b83feb90198b7f3.zip
IOS: Fixes compilation under Linux
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 5 insertions, 8 deletions
diff --git a/configure b/configure
index b3008a13d6..025e577be9 100755
--- a/configure
+++ b/configure
@@ -2056,8 +2056,8 @@ echo_n "Checking host CPU architecture... "
case $_host_cpu in
arm*)
case $_host_alias in
- arm-apple*)
- echo "Apple iPhone - ARM assembly disabled"
+ arm-apple-darwin11)
+ echo "Apple iOS 7+ - ARM assembly disabled"
;;
*)
echo "ARM"
@@ -2720,9 +2720,6 @@ if test -n "$_host"; then
_mt32emu=no
_seq_midi=no
_timidity=no
- _ar="ar cru"
- _ranlib=ranlib
- _strip=strip
;;
m68k-atari-mint)
append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE"
@@ -3025,9 +3022,9 @@ case $_backend in
append_var CFLAGS "-miphoneos-version-min=7.1 -arch armv7"
append_var CXXFLAGS "-miphoneos-version-min=7.1 -arch armv7"
if test -n "$SDKROOT"; then
- append_var LDFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
- append_var CFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
- append_var CXXFLAGS "-isysroot $SDKROOT -I $SDKROOT/usr/include"
+ append_var LDFLAGS "-mlinker-version=134.9 -B/usr/local/bin/arm-apple-darwin11-"
+ append_var CFLAGS "-isysroot $SDKROOT -F$SDKROOT/System/Library/Frameworks"
+ append_var CXXFLAGS "-isysroot $SDKROOT -I$SDKROOT/usr/include/c++/4.2.1 -F$SDKROOT/System/Library/Frameworks"
fi
;;
linuxmoto)