summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS3
-rw-r--r--skia/skia.gyp42
2 files changed, 45 insertions, 0 deletions
diff --git a/DEPS b/DEPS
index 0d2b6c4..6ccac80 100644
--- a/DEPS
+++ b/DEPS
@@ -96,6 +96,9 @@ deps = {
"src/third_party/skia/include":
(Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
+ "src/third_party/skia/third_party/glu":
+ (Var("googlecode_url") % "skia") + "/trunk/third_party/glu@" + Var("skia_revision"),
+
"src/third_party/WebKit/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 1d0531b..f59c079 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -41,6 +41,7 @@
'../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
'../third_party/skia/gpu/src/GrResource.cpp',
'../third_party/skia/gpu/src/GrStencil.cpp',
+ '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp',
'../third_party/skia/gpu/src/GrTexture.cpp',
'../third_party/skia/gpu/src/GrTextureCache.cpp',
'../third_party/skia/gpu/src/GrTextContext.cpp',
@@ -95,6 +96,7 @@
'../third_party/skia/gpu/include/GrTDArray.h',
'../third_party/skia/gpu/include/GrTHashCache.h',
'../third_party/skia/gpu/include/GrTLList.h',
+ '../third_party/skia/gpu/include/GrTesselatedPathRenderer.h',
'../third_party/skia/gpu/include/GrTextContext.h',
'../third_party/skia/gpu/include/GrTextStrike.h',
'../third_party/skia/gpu/include/GrTexture.h',
@@ -834,6 +836,7 @@
],
'dependencies': [
'skia_opts',
+ 'skia_libtess',
'../third_party/zlib/zlib.gyp:zlib',
],
'direct_dependent_settings': {
@@ -930,6 +933,45 @@
],
},
{
+ 'target_name': 'skia_libtess',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '../third_party/skia/third_party/glu',
+ ],
+ 'sources': [
+ '../third_party/skia/third_party/glu/internal_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': [