diff options
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-06-12 08:33:53 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-06-12 08:33:53 +0000 |
| commit | f0d4696ab3a73f033a03e58edb8b3cbd9290dbd4 (patch) | |
| tree | 08a725373ece9ade7c9816575ffcc1b2dd0e1989 /third_party | |
| parent | d41851480cc6c538844adbbff4ec3bfce8cde7b8 (diff) | |
| download | webrtc-f0d4696ab3a73f033a03e58edb8b3cbd9290dbd4.tar.gz | |
Add support for SSE intrinsics on gcc in libvpx.
BUG=none
TEST=build on Linux with -Dtarget_arch=ia32 -Ddisable_sse2=1, trybots
Review URL: https://webrtc-codereview.appspot.com/646009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2398 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libvpx/libvpx.gyp | 23 | ||||
| -rw-r--r-- | third_party/libvpx/libvpx_srcs_x86.gypi | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index 8c971731fe..ac65da7d54 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -33,6 +33,28 @@ ], }, 'conditions': [ + # TODO(andrew): Hack to ensure we pass -msse2 to gcc on Linux for files + # containing SSE intrinsics. This should be handled in the gyp generator + # scripts somehow. Clang (default on Mac) doesn't require this. + ['target_arch=="ia32"', { + 'targets' : [ + { + 'target_name': 'libvpx_sse2', + 'type': 'static_library', + 'include_dirs': [ + 'source/config/<(OS)/<(target_arch)', + 'source/libvpx', + 'source/libvpx/vp8/common', + 'source/libvpx/vp8/decoder', + 'source/libvpx/vp8/encoder', + ], + 'sources': [ + 'source/libvpx/vp8/encoder/x86/denoising_sse2.c', + ], + 'cflags': [ '-msse2', ], + }, + ], + }], [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', { 'targets': [ { @@ -67,6 +89,7 @@ 'includes': [ 'libvpx_srcs_x86.gypi', ], + 'dependencies': [ 'libvpx_sse2', ], }], [ 'target_arch=="x64"', { 'includes': [ diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi index ee8b85bbd3..ff418b8924 100644 --- a/third_party/libvpx/libvpx_srcs_x86.gypi +++ b/third_party/libvpx/libvpx_srcs_x86.gypi @@ -163,7 +163,8 @@ 'source/libvpx/vp8/encoder/treewriter.h', 'source/libvpx/vp8/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', - 'source/libvpx/vp8/encoder/x86/denoising_sse2.c', + # Hack; refer to libvpx.gyp + #'source/libvpx/vp8/encoder/x86/denoising_sse2.c', 'source/libvpx/vp8/encoder/x86/encodeopt.asm', 'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm', 'source/libvpx/vp8/encoder/x86/quantize_mmx.asm', |