aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Bénony2015-12-02 17:19:45 +0100
committerVincent Bénony2016-01-06 16:17:30 +0100
commit3831caaac5440132844c3ee038f01a511a7dc59a (patch)
tree90bd9e1e9ce5de09041bc7d91e4b92f40015ad29
parent304bffa90e6d32963d50a7cae64d1a7f186a5a81 (diff)
downloadscummvm-rg350-3831caaac5440132844c3ee038f01a511a7dc59a.tar.gz
scummvm-rg350-3831caaac5440132844c3ee038f01a511a7dc59a.tar.bz2
scummvm-rg350-3831caaac5440132844c3ee038f01a511a7dc59a.zip
IOS: Uses the SDKROOT variable only if provided
-rwxr-xr-xconfigure11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure b/configure
index dc2994d33b..cf70f8cb5f 100755
--- a/configure
+++ b/configure
@@ -3001,9 +3001,14 @@ case $_backend in
append_var LIBS "-lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES"
append_var LIBS "-framework QuartzCore -framework CoreFoundation -framework Foundation"
append_var LIBS "-framework AudioToolbox -framework CoreAudio"
- append_var LDFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7"
- append_var CFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7"
- append_var CXXFLAGS "-isysroot $SDKROOT -miphoneos-version-min=7.1 -arch armv7"
+ append_var LDFLAGS "-miphoneos-version-min=7.1 -arch armv7"
+ 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"
+ append_var CFLAGS "-isysroot $SDKROOT"
+ append_var CXXFLAGS "-isysroot $SDKROOT"
+ fi
;;
linuxmoto)
append_var DEFINES "-DLINUXMOTO"