Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 8b33bd8a4748369fcb76f31c46b9ff682ca22230..6583044e8741a95593fc010186e11c22558d710b 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -989,11 +989,23 @@ |
| }], |
| [ 'OS=="win"', { |
| 'variables': { |
| - 'yasm_flags': [ |
| - '-DWIN32', |
| - '-DMSVC', |
| - '-DCHROMIUM', |
| - '-Isimd', |
| + 'conditions': [ |
|
DaleCurtis
2013/01/26 01:44:14
Instead of doing this, you could convert this targ
wolenetz
2013/01/26 03:13:18
None of these are set (except PREFIX, incorrectly
|
| + [ 'target_arch=="ia32"', { |
| + 'yasm_flags': [ |
| + '-DWIN32', |
| + '-DMSVC', |
| + '-DCHROMIUM', |
| + '-Isimd', |
| + ], |
| + }, { |
| + 'yasm_flags': [ |
| + '-DWIN32', |
| + '-DARCH_X86_64', |
| + '-DMSVC', |
| + '-DCHROMIUM', |
| + '-Isimd', |
| + ], |
| + }], |
| ], |
| }, |
| }], |