Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / libvpx_srcs_x86_intrinsics.gypi

diff --git a/src/third_party/libvpx/libvpx_srcs_x86_intrinsics.gypi b/src/third_party/libvpx/libvpx_srcs_x86_intrinsics.gypi
index 5f72045..bb1b203 100644 (file)
--- a/src/third_party/libvpx/libvpx_srcs_x86_intrinsics.gypi
+++ b/src/third_party/libvpx/libvpx_srcs_x86_intrinsics.gypi
@@ -1,5 +1,5 @@
 # This file is generated. Do not edit.
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -16,19 +16,9 @@
         '<(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" and OS!="ios"', {
-          'cflags!': [ '-mfpu=vfpv3-d16' ],
-          'cflags': [ '-mmmx', ],
-        }],
-        ['OS=="mac" or OS=="ios"', {
-          'xcode_settings': {
-            'OTHER_CFLAGS': [ '-mmmx', ],
-          },
-        }],
       ],
+      'cflags': [ '-mmmx', ],
+      'xcode_settings': { 'OTHER_CFLAGS': [ '-mmmx' ] },
     },
     {
       'target_name': 'libvpx_intrinsics_sse2',
@@ -50,17 +40,8 @@
         '<(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" and OS!="ios"', {
-          'cflags!': [ '-mfpu=vfpv3-d16' ],
-          'cflags': [ '-msse2', ],
-        }],
-        ['OS=="mac" or OS=="ios"', {
-          'xcode_settings': {
-            'OTHER_CFLAGS': [ '-msse2', ],
-          },
-        }],
-      ],
+      'cflags': [ '-msse2', ],
+      'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] },
     },
     {
       'target_name': 'libvpx_intrinsics_ssse3',
@@ -72,16 +53,39 @@
       'sources': [
         '<(libvpx_source)/vp8/common/x86/variance_ssse3.c',
         '<(libvpx_source)/vp8/encoder/x86/quantize_ssse3.c',
+        '<(libvpx_source)/vp9/common/x86/vp9_idct_intrin_ssse3.c',
         '<(libvpx_source)/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c',
       ],
+      'cflags': [ '-mssse3', ],
+      'xcode_settings': { 'OTHER_CFLAGS': [ '-mssse3' ] },
       'conditions': [
-        ['os_posix==1 and OS!="mac" and OS!="ios"', {
-          'cflags!': [ '-mfpu=vfpv3-d16' ],
-          'cflags': [ '-mssse3', ],
+        ['OS=="win" and clang==1', {
+          # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe
+          # doesn't need it for intrinsics. clang-cl does need it, though.
+          'msvs_settings': {
+            'VCCLCompilerTool': { 'AdditionalOptions': [ '-mssse3' ] },
+          },
         }],
-        ['OS=="mac" or OS=="ios"', {
-          'xcode_settings': {
-            'OTHER_CFLAGS': [ '-mssse3', ],
+      ],
+    },
+    {
+      'target_name': 'libvpx_intrinsics_sse4_1',
+      'type': 'static_library',
+      'include_dirs': [
+        'source/config/<(OS_CATEGORY)/<(target_arch_full)',
+        '<(libvpx_source)',
+      ],
+      'sources': [
+        '<(libvpx_source)/vp8/encoder/x86/quantize_sse4.c',
+      ],
+      'cflags': [ '-msse4.1', ],
+      'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] },
+      'conditions': [
+        ['OS=="win" and clang==1', {
+          # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe
+          # doesn't need it for intrinsics. clang-cl does need it, though.
+          'msvs_settings': {
+            'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
           },
         }],
       ],