Commit | Line | Data |
---|---|---|
0826c9bd JB |
1 | --- chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp.orig 2013-10-22 11:54:40.000000000 +0200 |
2 | +++ chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp 2013-10-22 11:54:51.000000000 +0200 | |
3 | @@ -71,6 +71,63 @@ | |
4 | 'extra_header': 'chromium/ffmpeg_stub_headers.fragment', | |
5 | }, | |
6 | 'conditions': [ | |
7 | + ['target_arch != "arm"', { | |
8 | + 'targets': [ | |
9 | + { | |
10 | + 'target_name': 'ffmpeg_yasm', | |
11 | + 'type': 'static_library', | |
12 | + # VS2010 does not correctly incrementally link obj files generated | |
13 | + # from asm files. This flag disables UseLibraryDependencyInputs to | |
14 | + # avoid this problem. | |
15 | + 'msvs_2010_disable_uldi_when_referenced': 1, | |
16 | + 'includes': [ | |
17 | + 'ffmpeg_generated.gypi', | |
18 | + '../yasm/yasm_compile.gypi', | |
19 | + ], | |
20 | + 'sources': [ | |
21 | + '<@(asm_sources)', | |
22 | + # XCode doesn't want to link a pure assembly target and will fail | |
23 | + # to link when it creates an empty file list. So add a dummy file | |
24 | + # keep the linker happy. See http://crbug.com/157073 | |
25 | + 'xcode_hack.c', | |
26 | + ], | |
27 | + 'variables': { | |
28 | + # Path to platform configuration files. | |
29 | + 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)', | |
30 | + 'conditions': [ | |
31 | + ['target_arch == "ia32"', { | |
32 | + 'more_yasm_flags': [ | |
33 | + '-DARCH_X86_32', | |
34 | + ], | |
35 | + }, { | |
36 | + 'more_yasm_flags': [ | |
37 | + '-DARCH_X86_64', | |
38 | + ], | |
39 | + }], | |
40 | + ['OS == "mac"', { | |
41 | + 'more_yasm_flags': [ | |
42 | + # Necessary to ensure symbols end up with a _ prefix; added by | |
43 | + # yasm_compile.gypi for Windows, but not Mac. | |
44 | + '-DPREFIX', | |
45 | + ] | |
46 | + }], | |
47 | + ], | |
48 | + 'yasm_flags': [ | |
49 | + '-DPIC', | |
50 | + '>@(more_yasm_flags)', | |
51 | + '-I', '<(platform_config_root)', | |
52 | + '-I', 'libavcodec/x86/', | |
53 | + '-I', 'libavutil/x86/', | |
54 | + '-I', '.', | |
55 | + # Disable warnings, prevents log spam for things we won't fix. | |
56 | + '-w', | |
57 | + '-P', 'config.asm', | |
58 | + ], | |
59 | + 'yasm_output_path': '<(shared_generated_dir)/yasm' | |
60 | + }, | |
61 | + }, | |
62 | + ] # targets | |
63 | + }], # arch != arm | |
64 | ['OS == "win" and clang == 0', { | |
65 | # Convert the source code from c99 to c89 if we're on Windows and not | |
66 | # using clang, which can compile c99 directly. Clang support is | |
67 | @@ -593,58 +650,5 @@ | |
68 | }], | |
69 | ], # conditions | |
70 | }, | |
71 | - { | |
72 | - 'target_name': 'ffmpeg_yasm', | |
73 | - 'type': 'static_library', | |
74 | - # VS2010 does not correctly incrementally link obj files generated | |
75 | - # from asm files. This flag disables UseLibraryDependencyInputs to | |
76 | - # avoid this problem. | |
77 | - 'msvs_2010_disable_uldi_when_referenced': 1, | |
78 | - 'includes': [ | |
79 | - 'ffmpeg_generated.gypi', | |
80 | - '../yasm/yasm_compile.gypi', | |
81 | - ], | |
82 | - 'sources': [ | |
83 | - '<@(asm_sources)', | |
84 | - # XCode doesn't want to link a pure assembly target and will fail | |
85 | - # to link when it creates an empty file list. So add a dummy file | |
86 | - # keep the linker happy. See http://crbug.com/157073 | |
87 | - 'xcode_hack.c', | |
88 | - ], | |
89 | - 'variables': { | |
90 | - # Path to platform configuration files. | |
91 | - 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)', | |
92 | - 'conditions': [ | |
93 | - ['target_arch == "ia32"', { | |
94 | - 'more_yasm_flags': [ | |
95 | - '-DARCH_X86_32', | |
96 | - ], | |
97 | - }, { | |
98 | - 'more_yasm_flags': [ | |
99 | - '-DARCH_X86_64', | |
100 | - ], | |
101 | - }], | |
102 | - ['OS == "mac"', { | |
103 | - 'more_yasm_flags': [ | |
104 | - # Necessary to ensure symbols end up with a _ prefix; added by | |
105 | - # yasm_compile.gypi for Windows, but not Mac. | |
106 | - '-DPREFIX', | |
107 | - ] | |
108 | - }], | |
109 | - ], | |
110 | - 'yasm_flags': [ | |
111 | - '-DPIC', | |
112 | - '>@(more_yasm_flags)', | |
113 | - '-I', '<(platform_config_root)', | |
114 | - '-I', 'libavcodec/x86/', | |
115 | - '-I', 'libavutil/x86/', | |
116 | - '-I', '.', | |
117 | - # Disable warnings, prevents log spam for things we won't fix. | |
118 | - '-w', | |
119 | - '-P', 'config.asm', | |
120 | - ], | |
121 | - 'yasm_output_path': '<(shared_generated_dir)/yasm' | |
122 | - }, | |
123 | - }, | |
124 | ], # targets | |
125 | } |