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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/gmmain.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 1b56bf1e36..f0de5bdf92 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -862,7 +862,8 @@ GrContext* GetGr() { return NULL; } #endif } -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; @@ -1172,3 +1173,10 @@ int main(int argc, char * const argv[]) { return (0 == testsFailed) ? 0 : -1; } + +#if !defined SK_BUILD_FOR_IOS +int main(int argc, char * const argv[]) { + return tool_main(argc, (char**) argv); +} +#endif + |