SkiaExamples improvements.

Make it possible for a client to write a Hello World in less than 50 lines.

R=caryclark@google.com

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

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

2 files changed, 69 insertions, 76 deletions

diff --git a/gyp/SkiaExamples.gyp b/gyp/SkiaExamples.gyp
deleted file mode 100644
index 8f26a8addc..0000000000
--- a/gyp/SkiaExamples.gyp
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  'targets' : [
-  {
-    'target_name': 'SkiaExamples',
-      'type': 'executable',
-      'mac_bundle' : 1,
-      'include_dirs' : [],
-      'includes': [],
-      'sources': [
-        '../experimental/SkiaExamples/HelloSkiaExample.cpp',
-        '../experimental/SkiaExamples/BaseExample.h',
-        '../experimental/SkiaExamples/BaseExample.cpp',
-      ],
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-      'views.gyp:views',
-      'xml.gyp:xml',
-      ],
-      'conditions' : [
-        [ 'skia_gpu == 1', {
-          'include_dirs' : [
-            '../src/gpu',  #gl/GrGLUtil.h
-            ]
-        }],
-      [ 'skia_os == "win"', {
-        'sources' : [
-          '../src/views/win/SkOSWindow_Win.cpp',
-          '../src/views/win/skia_win.cpp',
-          ],
-        },
-      ],
-
-      [ 'skia_os == "mac"', {
-        'sources': [
-
-# SkiaExamples specific files
-        '../experimental/SkiaExamples/SkiaExamples-Info.plist',
-        '../experimental/SkiaExamples/SkExampleNSView.h',
-        '../experimental/SkiaExamples/SkExampleNSView.mm',
-
-# Mac files
-        '../src/views/mac/SampleAppDelegate.h',
-        '../src/views/mac/SampleAppDelegate.mm',
-        '../src/views/mac/SkEventNotifier.mm',
-        '../src/views/mac/skia_mac.mm',
-        '../src/views/mac/SkNSView.h',
-        '../src/views/mac/SkNSView.mm',
-        '../src/views/mac/SkOptionsTableView.h',
-        '../src/views/mac/SkOptionsTableView.mm',
-        '../src/views/mac/SkOSWindow_Mac.mm',
-        '../src/views/mac/SkTextFieldCell.h',
-        '../src/views/mac/SkTextFieldCell.m',
-        ],
-      'include_dirs' : [
-        '../src/views/mac/'
-        ],
-      'link_settings': {
-      },
-      'xcode_settings' : {
-        'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
-      },
-      'mac_bundle_resources' : [
-        '../experimental/SkiaExamples/SkiaExamples.xib'
-        ],
-      }
-    ],
-      ],
-  }
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp
index 09711ac400..5552b4c757 100644
--- a/gyp/experimental.gyp
+++ b/gyp/experimental.gyp
@@ -18,6 +18,75 @@
         ],
       },
     },
+    {
+      'target_name': 'SkiaExamples',
+      'type': 'executable',
+      'mac_bundle' : 1,
+      'include_dirs' : [
+        '../tools/flags',
+        ],
+      'includes': [],
+       'sources': [
+         '../experimental/SkiaExamples/SkExample.h',
+         '../experimental/SkiaExamples/SkExample.cpp',
+         '../experimental/SkiaExamples/HelloSkiaExample.cpp',
+       ],
+       'dependencies': [
+         'skia_lib.gyp:skia_lib',
+         'views.gyp:views',
+         'xml.gyp:xml',
+         'flags.gyp:flags'
+       ],
+       'conditions' : [
+         [ 'skia_gpu == 1', {
+           'include_dirs' : [
+             '../src/gpu',  #gl/GrGLUtil.h
+             ]
+         }],
+        [ 'skia_os == "win"', {
+         'sources' : [
+           '../src/views/win/SkOSWindow_Win.cpp',
+           '../src/views/win/skia_win.cpp',
+           ],
+          },
+        ],
+
+        [ 'skia_os == "mac"', {
+          'sources': [
+
+# SkiaExamples specific files
+          '../experimental/SkiaExamples/SkiaExamples-Info.plist',
+          '../experimental/SkiaExamples/SkExampleNSView.h',
+          '../experimental/SkiaExamples/SkExampleNSView.mm',
+
+# Mac files
+          '../src/views/mac/SampleAppDelegate.h',
+          '../src/views/mac/SampleAppDelegate.mm',
+          '../src/views/mac/SkEventNotifier.mm',
+          '../src/views/mac/skia_mac.mm',
+          '../src/views/mac/SkNSView.h',
+          '../src/views/mac/SkNSView.mm',
+          '../src/views/mac/SkOptionsTableView.h',
+          '../src/views/mac/SkOptionsTableView.mm',
+          '../src/views/mac/SkOSWindow_Mac.mm',
+          '../src/views/mac/SkTextFieldCell.h',
+          '../src/views/mac/SkTextFieldCell.m',
+          ],
+        'include_dirs' : [
+          '../src/views/mac/'
+          ],
+        'link_settings': {
+        },
+        'xcode_settings' : {
+          'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
+        },
+        'mac_bundle_resources' : [
+          '../experimental/SkiaExamples/SkiaExamples.xib'
+          ],
+        }
+      ],
+     ],
+    }
   ],
 }