commit 846872f75bf3bfa86dbc3d4d672118959193487a
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 16 18:21:03 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 16 18:21:03 2013 +0000
tree 7bc1e3d0ac5760e2c259c3d5dd591498856811a9
parent c7a40fad0b4c243087ad1adb14ebc2184d42cac0

Fix DM build failures:
  - forgot tool_main;
  - skip building where skia_gpu is false;
  - lots of scalar -> int warnings;
  - stray return on a void method;
  - stifle warning about a uint32_t cast to bool

BUG=
R=bungeman@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/26468005

git-svn-id: http://skia.googlecode.com/svn/trunk@11821 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/everything.gyp

diff --git a/gyp/everything.gyp b/gyp/everything.gyp
index f34b517..8758cc6 100644
--- a/gyp/everything.gyp
+++ b/gyp/everything.gyp
@@ -21,6 +21,10 @@
         }, {
           'dependencies': [ 'debugger.gyp:debugger' ],
         }],
+        # DM assumes you've got a GPU.
+        ['skia_gpu == 1', {
+          'dependencies': [ 'dm.gyp:dm' ],
+        }],
       ],
     },
   ],