aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2016-11-10 16:42:58 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-11 14:33:34 +0000
commit8af38a96475ac5ce83b20c16d9cf82bf1006b8c4 (patch)
tree1815e5aa6bd534f038e28fb17fee897eec540df6 /gyp
parentc51a3a4e3c81a1d4100d5d29d31bf3a02eda2a7c (diff)
skslc now uses standard Skia caps
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4660 Change-Id: Idaedae3f81426b97f5052bb872cdf0610e47a84f Reviewed-on: https://skia-review.googlesource.com/4660 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'gyp')
-rw-r--r--gyp/sksl.gyp3
-rw-r--r--gyp/skslc.gyp6
2 files changed, 9 insertions, 0 deletions
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': [