Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
46df7139
Commit
46df7139
authored
Jun 23, 2015
by
Tom Finegan
Committed by
Gerrit Code Review
Jun 23, 2015
Browse files
Merge "Fix building with iOS 9 beta SDK"
parents
7555e2b8
78637b61
Changes
1
Hide whitespace changes
Inline
Side-by-side
build/make/configure.sh
View file @
46df7139
...
...
@@ -728,6 +728,13 @@ process_common_toolchain() {
# Handle darwin variants. Newer SDKs allow targeting older
# platforms, so use the newest one available.
case
${
toolchain
}
in
arm
*
-darwin
*
)
ios_sdk_dir
=
"
$(
show_darwin_sdk_path iphoneos
)
"
if
[
-d
"
${
ios_sdk_dir
}
"
]
;
then
add_cflags
"-isysroot
${
ios_sdk_dir
}
"
add_ldflags
"-isysroot
${
ios_sdk_dir
}
"
fi
;;
*
-darwin
*
)
osx_sdk_dir
=
"
$(
show_darwin_sdk_path macosx
)
"
if
[
-d
"
${
osx_sdk_dir
}
"
]
;
then
...
...
@@ -803,7 +810,14 @@ process_common_toolchain() {
if
disabled neon
&&
enabled neon_asm
;
then
die
"Disabling neon while keeping neon-asm is not supported"
fi
soft_enable media
case
${
toolchain
}
in
*
-darwin
*
)
# Neon is guaranteed on iOS 6+ devices, while old media extensions
# no longer assemble with iOS 9 SDK
;;
*
)
soft_enable media
esac
;;
armv6
)
soft_enable media
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment