Chromium Code Reviews| Index: media/media.gyp |
| =================================================================== |
| --- media/media.gyp (revision 99676) |
| +++ media/media.gyp (working copy) |
| @@ -7,6 +7,7 @@ |
| 'chromium_code': 1, |
| # Override to dynamically link the PulseAudio library. |
| 'use_pulseaudio%': 0, |
| + 'use_system_yasm%': 0, |
| }, |
| 'targets': [ |
| { |
| @@ -380,10 +381,94 @@ |
| }, |
| }, |
| }], |
| + [ 'target_arch=="ia32" or target_arch=="x64"', { |
| + 'sources': [ |
| + 'base/simd/convert_rgb_to_yuv_ssse3.asm', |
| + ], |
| + }], |
| + [ 'OS=="win"', { |
|
Alpha Left Google
2011/09/06 17:08:32
I defined an include gypi file that helps to compi
|
| + 'variables': { |
| + 'object_suffix': 'obj', |
| + 'yasm_path': '../third_party/yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)', |
| + 'yasm_format': '-fwin32', |
| + 'yasm_flags': [ |
| + '-DWIN32', |
| + '-DMSVC', |
| + ], |
| + }, |
| + }], |
| + [ 'OS=="mac"', { |
| + 'dependencies': [ |
| + '../third_party/yasm/yasm.gyp:yasm#host', |
| + ], |
| + 'variables': { |
| + 'object_suffix': 'o', |
| + 'yasm_path': '<(PRODUCT_DIR)/yasm', |
| + 'yasm_format': '-fmacho', |
| + 'yasm_flags': [ |
| + '-DMACHO', |
| + ], |
| + }, |
| + }], |
| + [ 'OS=="linux"', { |
| + 'conditions': [ |
| + [ 'use_system_yasm==0', { |
| + 'dependencies': [ |
| + '../third_party/yasm/yasm.gyp:yasm#host', |
| + ], |
| + }], |
| + ], |
| + 'variables': { |
| + 'object_suffix': 'o', |
| + 'conditions': [ |
| + [ 'use_system_yasm==1', { |
| + 'yasm_path': '<!(which yasm)', |
| + }, { |
| + 'yasm_path': '<(PRODUCT_DIR)/yasm', |
| + }], |
| + [ 'target_arch=="ia32"', { |
| + 'yasm_format': '-felf', |
| + 'yasm_flags': [ |
| + '-DX86_32', |
| + '-DELF', |
| + ], |
| + }, { |
| + 'yasm_format': '-felf64', |
| + 'yasm_flags': [ |
| + '-DARCH_X86_64', |
| + '-DELF', |
| + '-DPIC', |
| + ], |
| + }], |
| + ], |
| + }, |
| + }], |
| ], |
| 'sources': [ |
| 'base/yuv_convert_sse2.cc', |
| + 'base/simd/convert_rgb_to_yuv.cc', |
| ], |
| + 'rules': [ |
| + { |
| + 'rule_name': 'assemble', |
| + 'extension': 'asm', |
| + 'inputs': [ '<(yasm_path)', ], |
| + 'outputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/media/<(RULE_INPUT_ROOT).<(object_suffix)', |
| + ], |
| + 'action': [ |
| + '<(yasm_path)', |
| + '<(yasm_format)', |
| + '<@(yasm_flags)', |
| + '-DCHROMIUM', |
| + '-Isimd/', |
| + '-o', '<(SHARED_INTERMEDIATE_DIR)/media/<(RULE_INPUT_ROOT).<(object_suffix)', |
| + '<(RULE_INPUT_PATH)', |
| + ], |
| + 'process_outputs_as_sources': 1, |
| + 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', |
| + }, |
| + ], |
| }, |
| { |
| 'target_name': 'ffmpeg_unittests', |
| @@ -460,6 +545,7 @@ |
| 'base/pts_stream_unittest.cc', |
| 'base/run_all_unittests.cc', |
| 'base/seekable_buffer_unittest.cc', |
| + 'base/simd/convert_rgb_to_yuv_unittest.cc', |
| 'base/state_matrix_unittest.cc', |
| 'base/test_data_util.cc', |
| 'base/test_data_util.h', |