aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2016-11-11 12:38:50 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-11 18:21:14 +0000
commit498d403f7703cb2157bf3c877b84906db5a06cd4 (patch)
tree88d7c27bbaee6d9b9614e29f9363b15543b7860c /gyp
parent041da389dd923689041ba5e45cda34901ba4fe8a (diff)
re-land of skslc now uses standard Skia caps
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4726 Change-Id: Ib1ea5d4269396e6c57ee1f0d7209aa9a9f2798e8 Reviewed-on: https://skia-review.googlesource.com/4726 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'gyp')
-rw-r--r--gyp/fuzz.gyp1
-rw-r--r--gyp/sksl.gyp3
-rw-r--r--gyp/skslc.gyp6
3 files changed, 10 insertions, 0 deletions
diff --git a/gyp/fuzz.gyp b/gyp/fuzz.gyp
index d96feec216..27b4d8ac58 100644
--- a/gyp/fuzz.gyp
+++ b/gyp/fuzz.gyp
@@ -22,6 +22,7 @@
'include_dirs': [
'../include/private',
'../src/core',
+ '../src/gpu',
'../src/pathops',
],
}],
diff --git a/gyp/sksl.gyp b/gyp/sksl.gyp
index c2fbbdd8cd..5ec29796bf 100644
--- a/gyp/sksl.gyp
+++ b/gyp/sksl.gyp
@@ -12,7 +12,10 @@
'include_dirs': [
'../include/config',
'../include/core',
+ '../include/gpu',
'../include/private',
+ '../include/utils',
+ '../src/gpu',
'../src/sksl',
],
'defines': [
diff --git a/gyp/skslc.gyp b/gyp/skslc.gyp
index c465aa4772..6f9ed608b7 100644
--- a/gyp/skslc.gyp
+++ b/gyp/skslc.gyp
@@ -13,13 +13,19 @@
'include_dirs': [
'../include/config',
'../include/core',
+ '../include/gpu',
'../include/private',
+ '../include/utils',
+ '../src/gpu',
'../src/sksl',
],
'sources': [
'<!@(python read_gni.py ../gn/sksl.gni skia_sksl_sources)',
'../src/sksl/SkSLMain.cpp',
],
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ ],
'configurations': {
'Debug': {
'defines': [