diff options
author | blundell@chromium.org <blundell@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-08-07 09:51:53 +0000 |
---|---|---|
committer | blundell@chromium.org <blundell@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-08-07 09:51:53 +0000 |
commit | a4f1359d210371b214377789a2542efb28723678 (patch) | |
tree | 299baa6ca40e1f2db5c57b417a3cab6db4e3f229 | |
parent | 841fff8cddd73c0d6b966902f83bea7ad366bd4b (diff) | |
download | libjpeg_turbo-a4f1359d210371b214377789a2542efb28723678.tar.gz |
Add support for iOS to libjpeg.gyp.
iOS will start pulling libjpeg_turbo in
https://codereview.chromium.org/376573003/ as part of enabling initial Mojo
support on iOS. To do so, iOS needs the same dependency from libjpeg_turbo to
yasm as Mac does; otherwise, GYP chokes in processing libjpeg.gyp due to
yasm_path being undefined.
R=noel@chromium.org, rmcilroy@chromium.org
Review URL: https://codereview.chromium.org//444883002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@288018 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r-- | libjpeg.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index c112c1e..4f1f7ec 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -220,7 +220,7 @@ ], }, }], - [ 'OS=="mac"', { + [ 'OS=="mac" or OS=="ios"', { 'dependencies': [ '../yasm/yasm.gyp:yasm#host', ], |