| Index: media/media.gyp
|
| ===================================================================
|
| --- media/media.gyp (revision 88621)
|
| +++ media/media.gyp (working copy)
|
| @@ -6,6 +6,7 @@
|
| 'variables': {
|
| 'chromium_code': 1,
|
| 'player_x11_renderer%': 'x11',
|
| + 'use_system_yasm%': 0,
|
| },
|
| 'targets': [
|
| {
|
| @@ -320,10 +321,93 @@
|
| },
|
| },
|
| }],
|
| + [ 'target_arch=="ia32" or target_arch=="x64"', {
|
| + 'sources': [
|
| + 'base/simd/convert_row.asm',
|
| + ],
|
| + }],
|
| + [ 'OS=="win"', {
|
| + '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_flag': '-D__X86__',
|
| + 'yasm_flags': [
|
| + '-D__x86__',
|
| + '-DELF',
|
| + ],
|
| + }, {
|
| + 'yasm_format': '-felf64',
|
| + 'yasm_flag': '-D__x86_64__',
|
| + 'yasm_flags': [
|
| + '-D__x86_64__',
|
| + '-DELF',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + }],
|
| ],
|
| 'sources': [
|
| 'base/yuv_convert_sse2.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)',
|
| + '-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',
|
|
|