Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 526c089fc69df20cf92a165a63d0a70167cfb670..0c992acbbdd36e84f0b0c3b5287e2df364bf8888 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -683,7 +683,7 @@ |
| 'message': 'Generating Pulse stubs for dynamic loading.', |
| }, |
| ], |
| - 'conditions': [ |
| + 'conditions': [ |
| # Linux/Solaris need libdl for dlopen() and friends. |
| ['OS == "linux" or OS == "solaris"', { |
| 'link_settings': { |
| @@ -811,6 +811,11 @@ |
| '../build/linux/system.gyp:gtk', |
| ], |
| }], |
| + ['target_arch == "ia32" or target_arch == "x64"', { |
| + 'dependencies': [ |
| + 'media_sse', |
| + ], |
| + }], |
| ], |
| 'target_conditions': [ |
| ['OS == "ios"', { |
| @@ -1022,6 +1027,9 @@ |
| 'sources': [ |
| 'base/simd/convert_rgb_to_yuv_unittest.cc', |
| ], |
| + 'dependencies': [ |
| + 'media_sse', |
| + ], |
| }], |
| [ 'screen_capture_supported == 0', { |
| 'sources/': [ |
| @@ -1610,5 +1618,28 @@ |
| }, # end of target differ_block_sse2 |
| ], |
| }], |
| + ['target_arch=="ia32" or target_arch=="x64"', { |
| + 'targets': [ |
| + { |
| + 'target_name': 'media_sse', |
| + 'type': 'static_library', |
| + 'conditions': [ |
| + # OSX already enables SSE2 or higher. |
|
Mark Mentovai
2013/03/05 21:32:31
…and OSX doesn’t use cflags either, so this would
DaleCurtis
2013/03/05 21:51:37
Yes! I was irritated that this expression was nece
|
| + ['OS != "mac"', { |
| + 'cflags': [ |
| + '-msse', |
| + ], |
| + }], |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'base/simd/sinc_resampler_sse.cc', |
| + 'base/simd/vector_math_sse.cc', |
| + ], |
| + }, # end of target media_sse |
| + ], |
| + }], |
| ], |
| } |