diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 13:14:44 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 13:14:44 +0000 |
| commit | c4c7e1882391a8cb206332b091347626986f0efb (patch) | |
| tree | ce117a7158b8fc4583804de6a42ba9a730656f30 /skia | |
| parent | 553c0417f7ebaed175ac0664c7f2389c85ed943d (diff) | |
| download | chromium_src-c4c7e1882391a8cb206332b091347626986f0efb.zip chromium_src-c4c7e1882391a8cb206332b091347626986f0efb.tar.gz chromium_src-c4c7e1882391a8cb206332b091347626986f0efb.tar.bz2 | |
Revert 136857 - roll skia to 3912
mirror of https://chromiumcodereview.appspot.com/10310126/
Review URL: https://chromiumcodereview.appspot.com/10391105
TBR=reed@google.com
Review URL: https://chromiumcodereview.appspot.com/10356152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 988fed2..ea106f5 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -409,6 +409,8 @@ '../third_party/skia/src/gpu/GrTDArray.h', '../third_party/skia/src/gpu/GrTHashCache.h', '../third_party/skia/src/gpu/GrTLList.h', + '../third_party/skia/src/gpu/GrTesselatedPathRenderer.cpp', + '../third_party/skia/src/gpu/GrTesselatedPathRenderer.h', '../third_party/skia/src/gpu/GrTextStrike.cpp', '../third_party/skia/src/gpu/GrTextStrike.h', '../third_party/skia/src/gpu/GrTextStrike_impl.h', @@ -1003,6 +1005,7 @@ ], 'dependencies': [ 'skia_opts', + 'skia_libtess', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../third_party/sfntly/sfntly.gyp:sfntly', '../third_party/zlib/zlib.gyp:zlib', @@ -1219,6 +1222,48 @@ ], }, { + 'target_name': 'skia_libtess', + 'type': 'static_library', + 'variables': { + 'optimize': 'max', + }, + 'include_dirs': [ + '../third_party/skia/third_party/glu', + ], + 'sources': [ + '../third_party/skia/third_party/glu/sk_glu.h', + '../third_party/skia/third_party/glu/gluos.h', + '../third_party/skia/third_party/glu/libtess/dict-list.h', + '../third_party/skia/third_party/glu/libtess/dict.c', + '../third_party/skia/third_party/glu/libtess/dict.h', + '../third_party/skia/third_party/glu/libtess/geom.c', + '../third_party/skia/third_party/glu/libtess/geom.h', + '../third_party/skia/third_party/glu/libtess/memalloc.c', + '../third_party/skia/third_party/glu/libtess/memalloc.h', + '../third_party/skia/third_party/glu/libtess/mesh.c', + '../third_party/skia/third_party/glu/libtess/mesh.h', + '../third_party/skia/third_party/glu/libtess/normal.c', + '../third_party/skia/third_party/glu/libtess/normal.h', + '../third_party/skia/third_party/glu/libtess/priorityq-heap.h', + '../third_party/skia/third_party/glu/libtess/priorityq-sort.h', + '../third_party/skia/third_party/glu/libtess/priorityq.c', + '../third_party/skia/third_party/glu/libtess/priorityq.h', + '../third_party/skia/third_party/glu/libtess/render.c', + '../third_party/skia/third_party/glu/libtess/render.h', + '../third_party/skia/third_party/glu/libtess/sweep.c', + '../third_party/skia/third_party/glu/libtess/sweep.h', + '../third_party/skia/third_party/glu/libtess/tess.c', + '../third_party/skia/third_party/glu/libtess/tess.h', + '../third_party/skia/third_party/glu/libtess/tessmono.c', + '../third_party/skia/third_party/glu/libtess/tessmono.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/skia/third_party/glu', + ], + }, + }, + { 'target_name': 'image_operations_bench', 'type': 'executable', 'dependencies': [ |