diff options
| author | fischman@chromium.org <fischman@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-03-27 20:38:48 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-03-27 20:38:48 +0000 |
| commit | c0c24abbd8c2e60ca231c882c33741ac501b4703 (patch) | |
| tree | ea6741da4df97f3dc21e2a185781c7ba8217e784 /libvpx_srcs_x86_intrinsics.gypi | |
| parent | 2cb6e5586451498e72e2b58eac385f3fc1da3251 (diff) | |
| download | libvpx-c0c24abbd8c2e60ca231c882c33741ac501b4703.tar.gz | |
libvpx: unbreak iOS simulator build
Before this change SSSE3 code was being failing to get built because of the
lack of -mssse3 on the command-line.
BUG=webrtc:3126
R=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/215023004
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@259973 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'libvpx_srcs_x86_intrinsics.gypi')
| -rw-r--r-- | libvpx_srcs_x86_intrinsics.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvpx_srcs_x86_intrinsics.gypi b/libvpx_srcs_x86_intrinsics.gypi index 57e4837..0c533d0 100644 --- a/libvpx_srcs_x86_intrinsics.gypi +++ b/libvpx_srcs_x86_intrinsics.gypi @@ -19,11 +19,11 @@ '<(libvpx_source)/vp9/encoder/x86/vp9_variance_mmx.c', ], 'conditions': [ - ['os_posix==1 and OS!="mac"', { + ['os_posix==1 and OS!="mac" and OS!="ios"', { 'cflags!': [ '-mfpu=vfpv3-d16' ], 'cflags': [ '-mmmx', ], }], - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'xcode_settings': { 'OTHER_CFLAGS': [ '-mmmx', ], }, @@ -51,11 +51,11 @@ '<(libvpx_source)/vp9/encoder/x86/vp9_variance_sse2.c', ], 'conditions': [ - ['os_posix==1 and OS!="mac"', { + ['os_posix==1 and OS!="mac" and OS!="ios"', { 'cflags!': [ '-mfpu=vfpv3-d16' ], 'cflags': [ '-msse2', ], }], - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2', ], }, @@ -74,11 +74,11 @@ '<(libvpx_source)/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c', ], 'conditions': [ - ['os_posix==1 and OS!="mac"', { + ['os_posix==1 and OS!="mac" and OS!="ios"', { 'cflags!': [ '-mfpu=vfpv3-d16' ], 'cflags': [ '-mssse3', ], }], - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'xcode_settings': { 'OTHER_CFLAGS': [ '-mssse3', ], }, |