commit f568f6a557dbc5a6b2f99b3747340ff7d36da26b
author caryclark <caryclark@google.com> Fri Jul 18 10:58:56 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 18 10:58:56 2014 -0700
tree 58184db4d87a3b2637c456e3109b0b2f4debbdc8
parent 1d1795b199f216e17ff6b63f8c8c1f653666cb79

git sample app working on iOS

R=jvanverth@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/405653002

gyp/SampleApp.gyp

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 2bbabf9..9a6ca43 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -211,6 +211,7 @@
           # TODO: This doesn't build properly yet, but it's getting there.
           'sources!': [
             '../samplecode/SampleDecode.cpp',
+            '../experimental/SimpleiOSApp/SimpleApp.mm',
           ],
           'sources': [
             '../src/views/mac/SkEventNotifier.mm',
@@ -237,7 +238,6 @@
             '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
 
             '../src/views/ios/SkOSWindow_iOS.mm',
-            '../src/utils/ios/SkImageDecoder_iOS.mm',
             '../src/utils/ios/SkStream_NSData.mm',
             # Not fully implemented yet
             # '../src/utils/ios/SkOSFile_iOS.mm',

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 8beb66a..3f37d35 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -8,6 +8,7 @@
 #include "SampleApp.h"
 
 #include "OverView.h"
+#include "Resources.h"
 #include "SampleCode.h"
 #include "SamplePipeControllers.h"
 #include "SkCanvas.h"
@@ -2385,7 +2386,9 @@
 }
 
 #ifdef SK_BUILD_FOR_IOS
-void save_args(int argc, char *argv[]) {
+bool set_cmd_line_args(int , char *[], const char* resourceDir) {
+    SetResourcePath(resourceDir);
+    return false;
 }
 #endif