Reland r8235 "Switch gm to use SkFlags."
This time, using #if guards for gpuCacheSize consistently.
Also fix some warnings.
BUG=https://code.google.com/p/skia/issues/detail?id=1094
Review URL: https://codereview.chromium.org/12440052
git-svn-id: http://skia.googlecode.com/svn/trunk@8254 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 9cbaf93..9ed7d68 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -3,8 +3,6 @@
# To build on Linux:
# ./gyp_skia tools.gyp && make tools
#
-# Building on other platforms not tested yet.
-#
{
'includes': [
'apptype_console.gypi',
@@ -66,12 +64,11 @@
'type': 'executable',
'sources': [
'../tools/skhello.cpp',
- '../tools/SkFlags.h',
- '../tools/SkFlags.cpp',
],
'dependencies': [
'skia_base_libs.gyp:skia_base_libs',
'effects.gyp:effects',
+ 'flags.gyp:flags',
'images.gyp:images',
],
},
@@ -137,8 +134,6 @@
'../tools/PictureRenderingFlags.cpp',
'../tools/CopyTilesRenderer.h',
'../tools/CopyTilesRenderer.cpp',
- '../tools/SkFlags.h',
- '../tools/SkFlags.cpp',
'../src/pipe/utils/SamplePipeControllers.h',
'../src/pipe/utils/SamplePipeControllers.cpp',
],
@@ -152,6 +147,7 @@
'effects.gyp:effects',
'images.gyp:images',
'tools.gyp:picture_utils',
+ 'flags.gyp:flags',
],
'conditions': [
['skia_gpu == 1',