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

Unified Diff: media/media.gyp

Issue 12036108: Enables win64 build of yuv_convert_simd_x86 without rolling x86inc.asm forward. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/simd/x86inc.asm ('k') | third_party/yasm/yasm_compile.gypi » ('j') | 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 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',
+ ],
+ }],
],
},
}],
« no previous file with comments | « media/base/simd/x86inc.asm ('k') | third_party/yasm/yasm_compile.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698