aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/skhello.cpp
diff options
context:
space:
mode:
authorGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-02 18:33:14 +0000
committerGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-02 18:33:14 +0000
commit5987f58036574ccf23049b5fe71f29a441d0641d (patch)
tree2f3078337c92b9387c9d36f7ed3de82eacc3d085 /tools/skhello.cpp
parent425a8c71e43841bf6e8622bf7f6a7985a2efe4c7 (diff)
build iOS with 'make all'
This builds all skia tests by treating iOS tools as executable applications. A few warnings were fixed as well. Removed old trace draw code and remnants. Review URL: https://codereview.appspot.com/6597063 git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools/skhello.cpp')
-rw-r--r--tools/skhello.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/skhello.cpp b/tools/skhello.cpp
index 82abf80ba7..465806f8fa 100644
--- a/tools/skhello.cpp
+++ b/tools/skhello.cpp
@@ -14,7 +14,8 @@ static void show_help() {
SkDebugf("usage: skhello [-o out-dir] [-t 'hello']\n default output: skhello.png\n");
}
-int main(int argc, char* const argv[]) {
+int tool_main(int argc, char** argv);
+int tool_main(int argc, char** argv) {
SkAutoGraphics ag;
SkString path("skhello.png");
SkString text("Hello");
@@ -68,3 +69,9 @@ int main(int argc, char* const argv[]) {
}
return !success;
}
+
+#if !defined SK_BUILD_FOR_IOS
+int main(int argc, char * const argv[]) {
+ return tool_main(argc, (char**) argv);
+}
+#endif