diff options
Diffstat (limited to 'chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi')
| -rw-r--r-- | chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi b/chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi index 9c95fb1a169..5f7204545ba 100644 --- a/chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi +++ b/chromium/third_party/libvpx/libvpx_srcs_x86_64_intrinsics.gypi @@ -9,19 +9,21 @@ 'target_name': 'libvpx_intrinsics_mmx', 'type': 'static_library', 'include_dirs': [ - 'source/config/<(OS_CATEGORY)/<(target_arch)', + 'source/config/<(OS_CATEGORY)/<(target_arch_full)', '<(libvpx_source)', ], 'sources': [ '<(libvpx_source)/vp8/common/x86/idct_blk_mmx.c', '<(libvpx_source)/vp8/common/x86/variance_mmx.c', '<(libvpx_source)/vp8/encoder/x86/vp8_enc_stubs_mmx.c', + '<(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', ], }, @@ -32,7 +34,7 @@ 'target_name': 'libvpx_intrinsics_sse2', 'type': 'static_library', 'include_dirs': [ - 'source/config/<(OS_CATEGORY)/<(target_arch)', + 'source/config/<(OS_CATEGORY)/<(target_arch_full)', '<(libvpx_source)', ], 'sources': [ @@ -44,12 +46,16 @@ '<(libvpx_source)/vp8/encoder/x86/vp8_enc_stubs_sse2.c', '<(libvpx_source)/vp9/common/x86/vp9_idct_intrin_sse2.c', '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_intrin_sse2.c', + '<(libvpx_source)/vp9/encoder/x86/vp9_dct32x32_sse2.c', + '<(libvpx_source)/vp9/encoder/x86/vp9_dct_sse2.c', + '<(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', ], }, @@ -60,17 +66,20 @@ 'target_name': 'libvpx_intrinsics_ssse3', 'type': 'static_library', 'include_dirs': [ - 'source/config/<(OS_CATEGORY)/<(target_arch)', + 'source/config/<(OS_CATEGORY)/<(target_arch_full)', '<(libvpx_source)', ], 'sources': [ '<(libvpx_source)/vp8/common/x86/variance_ssse3.c', + '<(libvpx_source)/vp8/encoder/x86/quantize_ssse3.c', + '<(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', ], }, |