From b00a85b7f30c9c3dc549524205631b9f2f429cf8 Mon Sep 17 00:00:00 2001 From: "keyar@chromium.org" Date: Mon, 20 Aug 2012 15:49:47 +0000 Subject: Fixed no GPU build. Not reviewed. git-svn-id: http://skia.googlecode.com/svn/trunk@5189 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/tools.gyp | 22 ++++++++++++++-------- 1 file 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', -- cgit v1.2.3