diff options
| author |  keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-20 15:49:47 +0000 |
|---|---|---|
| committer | keyar@chromium.org <keyar@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-20 15:49:47 +0000 |
| commit | b00a85b7f30c9c3dc549524205631b9f2f429cf8 (patch) | |
| tree | 46a1910c4854bece7ac28b59ec51c00ffdf3d527 | |
| parent | bf2768bab9f3b21c03a8f9a75dc891231d5857cc (diff) | |
Fixed no GPU build. Not reviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@5189 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/tools.gyp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 1a99f7676e..ca61453b46 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -127,18 +127,24 @@ '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', ], - 'include_dirs': [ - '../src/pipe/utils/', - ], + 'include_dirs': [ + '../src/pipe/utils', + ], 'dependencies': [ 'core.gyp:core', - 'gpu.gyp:gr', - 'gpu.gyp:skgr', 'tools.gyp:picture_utils', ], - 'export_dependent_settings': [ - 'gpu.gyp:gr', - ] + 'conditions': [ + ['skia_gpu == 1', { + 'dependencies': [ + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + 'export_dependent_settings': [ + 'gpu.gyp:gr', + ], + }], + ], }, { 'target_name': 'picture_utils', |