Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(935)

Unified Diff: media/media.gyp

Issue 12478002: Break out SSE functions into new media_sse target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix iOS. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/vector_math_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 526c089fc69df20cf92a165a63d0a70167cfb670..0b369ea85195a687b69700fb87db5eea23e8831f 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,12 @@
'../build/linux/system.gyp:gtk',
],
}],
+ # ios check is necessary due to http://crbug.com/172682.
+ ['OS != "ios" and (target_arch == "ia32" or target_arch == "x64")', {
+ 'dependencies': [
+ 'media_sse',
+ ],
+ }],
],
'target_conditions': [
['OS == "ios"', {
@@ -1018,12 +1024,15 @@
'audio/audio_low_latency_input_output_unittest.cc',
],
}],
- [ 'target_arch=="ia32" or target_arch=="x64"', {
+ ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
'sources': [
'base/simd/convert_rgb_to_yuv_unittest.cc',
],
+ 'dependencies': [
+ 'media_sse',
+ ],
}],
- [ 'screen_capture_supported == 0', {
+ ['screen_capture_supported == 0', {
'sources/': [
['exclude', '^video/capture/screen/'],
],
@@ -1610,5 +1619,27 @@
}, # end of target differ_block_sse2
],
}],
+ # ios check is necessary due to http://crbug.com/172682.
+ ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
+ 'targets': [
+ {
+ 'target_name': 'media_sse',
+ 'type': 'static_library',
+ 'cflags': [
+ '-msse',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'defines': [
+ 'MEDIA_IMPLEMENTATION',
+ ],
+ 'sources': [
+ 'base/simd/sinc_resampler_sse.cc',
+ 'base/simd/vector_math_sse.cc',
+ ],
+ }, # end of target media_sse
+ ],
+ }],
],
}
« no previous file with comments | « media/base/vector_math_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698