| Index: third_party/libwebp/libwebp.gyp
|
| diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
|
| index f6047be196be43cf1449ca3ada9896c4bf5d2277..7a8533ad6cba0cc2bcf1d5a09a75ca6ead538217 100644
|
| --- a/third_party/libwebp/libwebp.gyp
|
| +++ b/third_party/libwebp/libwebp.gyp
|
| @@ -83,7 +83,10 @@
|
| ['OS == "android"', {
|
| 'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ],
|
| }],
|
| - ['target_arch=="ia32" or target_arch=="x64"', {
|
| + # iOS uses the same project to generate build project for both device
|
| + # and simulator and do not use "target_arch" variable. Other platform
|
| + # set it correctly.
|
| + ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
|
| 'defines': [ 'WEBP_HAVE_SSE2', 'WEBP_HAVE_SSE41' ],
|
| }],
|
| ['order_profiling != 0', {
|
| @@ -113,7 +116,10 @@
|
| 'dsp/yuv_sse2.c',
|
| ],
|
| 'conditions': [
|
| - ['(target_arch=="ia32" or target_arch=="x64") and msan==0', {
|
| + # iOS uses the same project to generate build project for both device
|
| + # and simulator and do not use "target_arch" variable. Other platform
|
| + # set it correctly.
|
| + ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', {
|
| 'cflags': [ '-msse2', ],
|
| 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] },
|
| }],
|
| @@ -144,7 +150,10 @@
|
| 'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
|
| },
|
| }],
|
| - ['(target_arch=="ia32" or target_arch=="x64") and msan==0', {
|
| + # iOS uses the same project to generate build project for both device
|
| + # and simulator and do not use "target_arch" variable. Other platform
|
| + # set it correctly.
|
| + ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', {
|
| 'cflags': [ '-msse4.1', ],
|
| 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] },
|
| }],
|
|
|