add simple ios app

update ios flavor of sample app
fix utils.gyp for ios

git-svn-id: http://skia.googlecode.com/svn/trunk@5686 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index e384e13..6de6f70 100644 (file)
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -205,6 +205,8 @@
           'sources': [
             '../src/views/mac/SkEventNotifier.h',
             '../src/views/mac/SkEventNotifier.mm',
+            '../experimental/iOSSampleApp/SkSampleUIView.h',
+            '../experimental/iOSSampleApp/SkSampleUIView.mm',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
@@ -264,6 +266,10 @@
             '../experimental/iOSSampleApp/iPhone',
             '../include/utils/ios',
           ],
+          'xcode_settings' : {
+            'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
+          },
+          'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
           'mac_bundle_resources' : [
             '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
             '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',

diff --git a/gyp/SimpleiOSApp.gyp b/gyp/SimpleiOSApp.gyp
new file mode 100644 (file)
index 0000000..5b69e64
--- /dev/null
+++ b/gyp/SimpleiOSApp.gyp
@@ -0,0 +1,74 @@
+{
+  'conditions' : [
+    [ 'skia_os != "ios"', {
+      'error': '<!(set GYP_DEFINES=\"skia_os=\'ios\'\")'
+    }],
+  ],
+  'targets': [
+    {
+      'target_name': 'SimpleiOSApp',
+      'type': 'executable',
+      'mac_bundle' : 1,
+      'include_dirs' : [
+        '../experimental/iOSSampleApp/Shared',
+      ],
+      'sources': [
+        '../src/views/ios/SkOSWindow_iOS.mm',
+        '../src/views/mac/SkEventNotifier.h',
+        '../src/views/mac/SkEventNotifier.mm',
+        '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
+        '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
+        '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
+        '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
+        '../experimental/iOSSampleApp/Shared/SkUIView.h',
+        '../experimental/iOSSampleApp/Shared/SkUIView.mm',
+        '../experimental/iOSSampleApp/Shared/skia_ios.mm',
+        '../experimental/SimpleiOSApp/SimpleApp.h',
+        '../experimental/SimpleiOSApp/SimpleApp.mm',
+        '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist',
+      ],
+      'dependencies': [
+        'core.gyp:core',
+        'effects.gyp:effects',
+        'images.gyp:images',
+        'opts.gyp:opts',
+        'ports.gyp:ports',
+        'utils.gyp:utils',
+        'views.gyp:views',
+        'xml.gyp:xml',
+      ],
+      'link_settings': {
+        'libraries': [
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework',
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework',
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework',
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework',
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework',
+          '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework',
+        ],
+        'libraries!': [
+          #remove mac dependencies
+          '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+          '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+          '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+          '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+          '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
+        ],
+      },
+      'xcode_settings' : {
+        'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist',
+      },
+      'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
+      'mac_bundle_resources' : [
+        '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib',
+        '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib',
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 49b4599..e5274ed 100644 (file)
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -98,6 +98,8 @@
               '$(SDKROOT)/System/Library/Frameworks/AGL.framework',
             ],
           },
+        }],
+        [ 'skia_os in ["mac", "ios"]', {
           'direct_dependent_settings': {
             'include_dirs': [
               '../include/utils/mac',