diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/bench.gypi | 1 | ||||
| -rw-r--r-- | gyp/core.gyp | 1 | ||||
| -rw-r--r-- | gyp/debugger.gyp | 1 | ||||
| -rw-r--r-- | gyp/dm.gypi | 1 | ||||
| -rw-r--r-- | gyp/effects.gyp | 1 | ||||
| -rw-r--r-- | gyp/example.gyp | 1 | ||||
| -rw-r--r-- | gyp/gpu.gyp | 1 | ||||
| -rw-r--r-- | gyp/gputest.gyp | 1 | ||||
| -rw-r--r-- | gyp/pdf.gyp | 1 | ||||
| -rw-r--r-- | gyp/ports.gyp | 1 | ||||
| -rw-r--r-- | gyp/svg.gyp | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 3 | ||||
| -rw-r--r-- | gyp/utils.gyp | 1 | ||||
| -rw-r--r-- | gyp/utils.gypi | 1 | ||||
| -rw-r--r-- | gyp/views.gyp | 1 | ||||
| -rw-r--r-- | gyp/visualbench.gyp | 5 | ||||
| -rw-r--r-- | gyp/xps.gyp | 1 |
18 files changed, 21 insertions, 3 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 7ccda93619..d0c0876948 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -16,6 +16,7 @@ 'target_name': 'SampleApp', 'type': 'executable', 'include_dirs' : [ + '../include/private', '../src/core', '../src/effects', #needed for BlurMask.h '../src/gpu', # needed by SkLua.cpp diff --git a/gyp/bench.gypi b/gyp/bench.gypi index a637202aa8..e102a97f1b 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -6,6 +6,7 @@ 'include_dirs': [ '../bench/subset', '../bench', + '../include/private', '../src/core', '../src/effects', '../src/gpu', diff --git a/gyp/core.gyp b/gyp/core.gyp index ebf8786fed..2569a9478f 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -23,6 +23,7 @@ '../include/pathops', '../include/pipe', '../include/ports', + '../include/private', '../include/utils', '../include/images', '../src/core', diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index e9133901e6..83bbbf01c2 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -82,6 +82,7 @@ '/Library/Frameworks', ], 'include_dirs' : [ + '../include/private', '../src/core', '../src/utils/debugger', '../debugger', # To pull SkDebugger.h diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 03a5ad36ea..9dd3228957 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -7,6 +7,7 @@ 'include_dirs': [ '../dm', '../gm', + '../include/private', '../src/core', '../src/effects', '../src/images', diff --git a/gyp/effects.gyp b/gyp/effects.gyp index 154e5676c5..fa1bf537fd 100644 --- a/gyp/effects.gyp +++ b/gyp/effects.gyp @@ -20,6 +20,7 @@ ], 'include_dirs': [ '../include/effects', + '../include/private', '../src/effects', '../src/opts', '../src/core', diff --git a/gyp/example.gyp b/gyp/example.gyp index a01717e67e..769e7309b0 100644 --- a/gyp/example.gyp +++ b/gyp/example.gyp @@ -12,6 +12,7 @@ 'target_name': 'HelloWorld', 'type': 'executable', 'include_dirs' : [ + '../include/private', '../include/gpu', ], 'sources': [ diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index e49f706bb9..bfd9d384dc 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -94,6 +94,7 @@ ], 'include_dirs': [ '../include/gpu', + '../include/private', '../src/core', '../src/gpu', '../src/image/', diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp index 868bc345f5..6100363f46 100644 --- a/gyp/gputest.gyp +++ b/gyp/gputest.gyp @@ -14,6 +14,7 @@ ], 'include_dirs': [ '../include/gpu', + '../include/private', '../include/utils', '../src/core', '../src/gpu', diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp index 270cce5e02..7efbb5ccf3 100644 --- a/gyp/pdf.gyp +++ b/gyp/pdf.gyp @@ -19,6 +19,7 @@ 'pdf.gypi', ], 'include_dirs': [ + '../include/private', '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h '../src/pdf', '../src/utils', # needed to get SkBitSet.h diff --git a/gyp/ports.gyp b/gyp/ports.gyp index a0cfbd64da..bfbd01c2df 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -17,6 +17,7 @@ '../include/effects', '../include/images', '../include/ports', + '../include/private', '../include/utils', '../include/utils/win', '../src/core', diff --git a/gyp/svg.gyp b/gyp/svg.gyp index df0c45cd0d..ddcbb93511 100644 --- a/gyp/svg.gyp +++ b/gyp/svg.gyp @@ -14,6 +14,7 @@ 'xml.gyp:*', ], 'include_dirs': [ + '../include/private', '../include/svg', '../src/core', ], diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 855bfd748d..9b772be56c 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -269,6 +269,7 @@ '../tools/skpinfo.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', ], 'dependencies': [ @@ -417,6 +418,7 @@ '../tools/LazyDecodeBitmap.cpp', ], 'include_dirs': [ + '../include/private', '../src/core/', '../src/images', '../src/lazy', @@ -576,6 +578,7 @@ 'target_name': 'filter', 'type': 'executable', 'include_dirs' : [ + '../include/private', '../src/core', '../src/utils/debugger', ], diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 3171d36a2b..429984643b 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -22,6 +22,7 @@ '../include/images', '../include/pathops', '../include/pipe', + '../include/private', '../include/utils', '../include/utils/mac', '../include/utils/unix', diff --git a/gyp/utils.gypi b/gyp/utils.gypi index 22f8652966..50f8ed618c 100644 --- a/gyp/utils.gypi +++ b/gyp/utils.gypi @@ -101,7 +101,6 @@ '<(skia_src_path)/utils/SkThreadUtils_win.cpp', '<(skia_src_path)/utils/SkThreadUtils_win.h', '<(skia_src_path)/utils/SkTFitsIn.h', - '<(skia_src_path)/utils/SkTLogic.h', #mac '<(skia_include_path)/utils/mac/SkCGUtils.h', diff --git a/gyp/views.gyp b/gyp/views.gyp index e7abc54aab..83ce377534 100644 --- a/gyp/views.gyp +++ b/gyp/views.gyp @@ -20,6 +20,7 @@ 'xml.gyp:xml', ], 'include_dirs': [ + '../include/private', '../include/views', '../include/views/unix', '../src/gpu', diff --git a/gyp/visualbench.gyp b/gyp/visualbench.gyp index 4bf559ae98..4900826a94 100644 --- a/gyp/visualbench.gyp +++ b/gyp/visualbench.gyp @@ -17,6 +17,7 @@ 'include_dirs' : [ '../bench', '../include/gpu', + '../include/private', '../src/core', '../src/effects', '../src/images', @@ -38,7 +39,7 @@ 'dependencies': [ 'etc1.gyp:libetc1', 'flags.gyp:flags', - 'gputest.gyp:skgputest', + 'gputest.gyp:skgputest', 'skia_lib.gyp:skia_lib', 'tools.gyp:proc_stats', 'tools.gyp:sk_tool_utils', @@ -57,7 +58,7 @@ '-lGLESv2', '-lEGL', ], - }, + }, }], ], }, diff --git a/gyp/xps.gyp b/gyp/xps.gyp index 454e065e16..d69880a2b1 100644 --- a/gyp/xps.gyp +++ b/gyp/xps.gyp @@ -16,6 +16,7 @@ 'skia_lib.gyp:skia_lib', ], 'include_dirs': [ + '../include/private', '../include/device/xps', '../include/utils/win', '../src/core', # needed to get SkGlyphCache.h |