nibless mac, visual bench working on mac

gyp/SampleApp.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'variables': {
     #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp
     'sample_pdf_file_viewer%': 0,
   },
   'targets': [
     {
       'target_name': 'SampleApp',
       'type': 'executable',
-      'mac_bundle' : 1,
       'include_dirs' : [
         '../src/core',
         '../src/effects', #needed for BlurMask.h
         '../src/gpu', # needed by SkLua.cpp
         '../src/images',
         '../src/lazy',
         '../gm',       # needed to pull gm.h
         '../samplecode', # To pull SampleApp.h and SampleCode.h
         '../src/pipe/utils', # For TiledPipeController
         '../src/utils/debugger',
@@ skipping 145 matching lines @@
          'sources': [
            '../samplecode/SamplePdfFileViewer.cpp',
          ]
        }],
         [ 'skia_os == "win"', {
           'sources!': [
             # require UNIX functions
             '../samplecode/SampleEncode.cpp',
           ],
         }],
-        [ 'skia_os == "mac"', {
-          'sources': [
-            # Sample App specific files
-            '../src/views/mac/SampleApp-Info.plist',
-            '../src/views/mac/SampleAppDelegate.h',
-            '../src/views/mac/SampleAppDelegate.mm',
-            '../src/views/mac/SkSampleNSView.h',
-            '../src/views/mac/SkSampleNSView.mm',
-
-            # Mac files
-            '../src/views/mac/SkEventNotifier.h',
-            '../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',
-          ],
-          'libraries': [
-            '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-            '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-          ],
-          'xcode_settings' : {
-            'INFOPLIST_FILE' : '../src/views/mac/SampleApp-Info.plist',
-          },
-          'mac_bundle_resources' : [
-            '../src/views/mac/SampleApp.xib',
-          ],
-        }],
         [ 'skia_os == "ios"', {
           # 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',
             '../experimental/iOSSampleApp/SkSampleUIView.mm',
             '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
@@ skipping 70 matching lines @@
         }],
         [ 'skia_gpu == 1', {
           'dependencies': [
             'gputest.gyp:skgputest',
           ],
         }],
       ],
     },
   ],
 }