diff options
Diffstat (limited to 'chromium/third_party/qcms/qcms.gyp')
| -rw-r--r-- | chromium/third_party/qcms/qcms.gyp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/chromium/third_party/qcms/qcms.gyp b/chromium/third_party/qcms/qcms.gyp index 1608a272275..298f6158d28 100644 --- a/chromium/third_party/qcms/qcms.gyp +++ b/chromium/third_party/qcms/qcms.gyp @@ -30,23 +30,8 @@ # removed on next roll. 'msvs_disabled_warnings': [ 4018 ], - 'variables': { - 'conditions': [ - # For x86, turn off SSE2 for non-CrOS *nix Chrome builds. - # TODO(jschuh): Get MMX enabled on Win64. crbug.com/179657 - ['disable_sse2==1 or \ - (branding=="Chrome" and target_arch=="ia32" and \ - os_posix==1 and OS!="mac" and chromeos==0) or \ - (OS=="win" and target_arch=="x64")', { - 'qcms_use_sse': 0, - }, { - 'qcms_use_sse': 1, - }], - ], - }, - 'conditions': [ - [ 'qcms_use_sse==1', { + ['target_arch=="ia32" or target_arch=="x64"', { 'defines': [ 'SSE2_ENABLE', ], @@ -55,6 +40,13 @@ 'src/transform-sse2.c', ], }], + # QCMS assumes this target isn't compiled since MSVC x64 doesn't support + # the MMX intrinsics present in the SSE1 code. + ['OS=="win" and target_arch=="x64"', { + 'sources!': [ + 'src/transform-sse1.c', + ], + }], ['OS == "win" and (MSVS_VERSION == "2013" or MSVS_VERSION == "2013e")', { 'msvs_disabled_warnings': [ 4056, # overflow in floating-point constant arithmetic (INFINITY) |