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
diff --git a/experimental/SimpleiOSApp/SimpleApp.mm b/experimental/SimpleiOSApp/SimpleApp.mm
index 12dff34..dba8bcc 100644
--- a/experimental/SimpleiOSApp/SimpleApp.mm
+++ b/experimental/SimpleiOSApp/SimpleApp.mm
@@ -3,6 +3,10 @@
#import "SkWindow.h"
#include "SkGraphics.h"
#include "SkCGUtils.h"
+
+extern void tool_main(int argc, char *argv[]);
+void save_args(int argc, char *argv[]);
+
class SkSampleView : public SkView {
public:
SkSampleView() {
@@ -15,7 +19,7 @@
SkPaint p;
p.setTextSize(20);
p.setAntiAlias(true);
- canvas->drawText("Hello World!", 13, 50, 30, p);
+ canvas->drawText("finished", 13, 50, 30, p);
SkRect r = {50, 50, 80, 80};
p.setColor(0xAA11EEAA);
canvas->drawRect(r, p);
@@ -34,6 +38,14 @@
SkEvent::Term();
}
+int saved_argc;
+char** saved_argv;
+
+void save_args(int argc, char *argv[]) {
+ saved_argc = argc;
+ saved_argv = argv;
+}
+
class FillLayout : public SkView::Layout {
protected:
virtual void onLayoutChildren(SkView* parent) {
@@ -46,6 +58,7 @@
@implementation SimpleApp
- (id)initWithDefaults {
+ (void) tool_main(saved_argc, saved_argv);
if (self = [super initWithDefaults]) {
fWind = new SkOSWindow(self);
fWind->setLayout(new FillLayout, false);