diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 16:04:54 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-27 16:04:54 +0000 |
| commit | 230504d6b5ff848913638c399ad43c0b6bcf723f (patch) | |
| tree | fb9520607f89c1100bcc4d19fdbce6686c24f36a /gyp | |
| parent | 34dc9a2dae8e9a5c4d3366a6957724e7289391e3 (diff) | |
Make SampleApp work on iPhone/iOS simulator.
Several parts to this:
1) The DeviceManager subclass for iOS was rewritten because the base class
changed.
2) Two old samples that rely on hardcoded paths to images are deleted. They hit
assertions in SkImageRef. No one has the required images to run these anyway.
3) argv must be non-NULL.
4) The UI delegate must not be loaded from the NIB for viewDidLoad ordering
reasons. So I removed an IBOutlet link from the window to the splitview
controller in the iPad's NIB file. The split view is attached by the AppDelegate
programmatically.
This doesn't make GPU work. That will come in a later change.
Review URL: https://codereview.appspot.com/6561056/
git-svn-id: http://skia.googlecode.com/svn/trunk@5712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 6de6f70ff7..c8b9ba75e6 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -61,8 +61,6 @@ '../samplecode/SampleHairCurves.cpp', '../samplecode/SampleHairline.cpp', '../samplecode/SampleHairModes.cpp', - '../samplecode/SampleImage.cpp', - '../samplecode/SampleImageDir.cpp', '../samplecode/SampleLayerMask.cpp', '../samplecode/SampleLayers.cpp', '../samplecode/SampleLCD.cpp', |