diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-02 18:33:14 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-02 18:33:14 +0000 |
| commit | 5987f58036574ccf23049b5fe71f29a441d0641d (patch) | |
| tree | 2f3078337c92b9387c9d36f7ed3de82eacc3d085 /tests/skia_test.cpp | |
| parent | 425a8c71e43841bf6e8622bf7f6a7985a2efe4c7 (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 'tests/skia_test.cpp')
| -rw-r--r-- | tests/skia_test.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp index 5c80a01fc3..f884a6458b 100644 --- a/tests/skia_test.cpp +++ b/tests/skia_test.cpp @@ -106,7 +106,8 @@ private: bool fAndroidMode; }; -int main (int argc, char * const argv[]) { +int tool_main(int argc, char** argv); +int tool_main(int argc, char** argv) { #ifdef SK_ENABLE_INST_COUNT gPrintInstCount = true; #endif @@ -188,3 +189,10 @@ int main (int argc, char * const argv[]) { return (failCount == 0) ? 0 : 1; } + +#if !defined SK_BUILD_FOR_IOS +int main(int argc, char * const argv[]) { + return tool_main(argc, (char**) argv); +} +#endif + |