diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-08 10:25:52 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-08 10:25:52 +0100 |
| commit | 8c787f522e5df2f0331d53661c512dc0a126573d (patch) | |
| tree | 1a47fc6d513871467004d4901578f8b4538a48b3 | |
| parent | d383201bb8dd404105c3f8dd06ee28503fe0c39b (diff) | |
| parent | 746ca77315235abb651c35dcc92609bf5f9f35ce (diff) | |
| download | gyp-8c787f522e5df2f0331d53661c512dc0a126573d.tar.gz | |
Merge from Chromium at DEPS revision r216370
This commit was generated by merge_to_master.py.
Change-Id: I8fda82d818167706a51d5fea874de69099e587fa
| -rw-r--r-- | effects.gypi | 1 | ||||
| -rw-r--r-- | opts.gyp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/effects.gypi b/effects.gypi index 63857c9..05ce569 100644 --- a/effects.gypi +++ b/effects.gypi @@ -22,6 +22,7 @@ '<(skia_src_path)/effects/SkColorFilterImageFilter.cpp', '<(skia_src_path)/effects/SkColorMatrix.cpp', '<(skia_src_path)/effects/SkColorMatrixFilter.cpp', + '<(skia_src_path)/effects/SkComposeImageFilter.cpp', '<(skia_src_path)/effects/SkCornerPathEffect.cpp', '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', @@ -122,14 +122,7 @@ '-mssse3', ], }], - # TODO(epoger): the following will enable SSSE3 on Macs, but it will - # break once we set OTHER_CFLAGS anywhere else (the first setting will - # be replaced, not added to) - [ 'skia_os in ["mac"]', { - 'xcode_settings': { - 'OTHER_CFLAGS': ['-mssse3',], - }, - }], + # (Mac has -mssse3 globally.) [ 'skia_arch_type == "x86"', { 'sources': [ '../src/opts/SkBitmapProcState_opts_SSSE3.cpp', |