diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
| commit | 867cbd8bc29371a360194aed648c4d43307b0639 (patch) | |
| tree | a8304af47996be63595ff3659546f82772230d6b /experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h | |
| parent | db545aec7267b10f1cb925204862f7e16753b724 (diff) | |
first cut at making iOS work
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files
https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045
git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h')
| -rw-r--r-- | experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h b/experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h index 2c9f391803..13d6c1b8a4 100644 --- a/experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h +++ b/experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h @@ -29,8 +29,8 @@ @property (nonatomic, retain) SkOptionListItem* fCurrentList; - (void)registerMenus:(const SkTDArray<SkOSMenu*>*)menus; -- (void)updateMenu:(const SkOSMenu*)menu; -- (void)loadMenu:(const SkOSMenu*)menu; +- (void)updateMenu:(SkOSMenu*)menu; +- (void)loadMenu:(SkOSMenu*)menu; - (UITableViewCell*)createAction:(NSString*)title; - (UITableViewCell*)createSlider:(NSString*)title min:(float)min max:(float)max default:(float)value; |