diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/apptype_console.gypi | 48 | ||||
| -rw-r--r-- | gyp/dm.gypi | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 12 |
3 files changed, 37 insertions, 24 deletions
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index b9939987b8..53cadf5024 100644 --- a/gyp/apptype_console.gypi +++ b/gyp/apptype_console.gypi @@ -27,24 +27,32 @@ 'target_conditions': [ ['_type == "executable"', { 'mac_bundle' : 1, + 'sources': [ + '../src/views/ios/SkOSWindow_iOS.mm', + '../src/views/mac/SkEventNotifier.mm', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/Shared/SkUIView.mm', + '../experimental/iOSSampleApp/Shared/skia_ios.mm', + '../experimental/SimpleiOSApp/SimpleApp.mm', + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp/Shared', + '../include/views', + '../include/xml', + '../include/utils/mac', + '../src/views/mac', + ], + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', + '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist', + }, }], ], - 'include_dirs' : [ - '../experimental/iOSSampleApp/Shared', - '../include/views', - '../include/xml', - '../include/utils/mac', - '../src/views/mac', - ], - 'sources': [ - '../src/views/ios/SkOSWindow_iOS.mm', - '../src/views/mac/SkEventNotifier.mm', - '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', - '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', - '../experimental/iOSSampleApp/Shared/SkUIView.mm', - '../experimental/iOSSampleApp/Shared/skia_ios.mm', - '../experimental/SimpleiOSApp/SimpleApp.mm', - ], 'dependencies': [ 'views.gyp:views', 'xml.gyp:xml', @@ -59,14 +67,6 @@ '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', ], }, - 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', - 'mac_bundle_resources' : [ - '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', - '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', - ], - 'xcode_settings' : { - 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist', - }, }], ], }, diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 92262f3a75..238c153099 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -19,6 +19,7 @@ 'jsoncpp.gyp:jsoncpp', 'skia_lib.gyp:skia_lib', 'tools.gyp:crash_handler', + 'tools.gyp:sk_tool_proc_stats', 'tools.gyp:sk_tool_utils', ], 'includes': [ diff --git a/gyp/tools.gyp b/gyp/tools.gyp index f36c523435..f4d927cd89 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -530,6 +530,7 @@ 'pdf.gyp:pdf', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_utils', + 'tools.gyp:sk_tool_proc_stats', ], 'conditions': [ ['skia_win_debuggers_path and skia_os == "win"', @@ -646,6 +647,17 @@ 'skia_lib.gyp:skia_lib', ], }, + { + 'target_name': 'sk_tool_proc_stats', + 'type': 'static_library', + 'sources': [ + '../tools/ProcStats.h', + '../tools/ProcStats.cpp', + ], + 'direct_dependent_settings': { + 'include_dirs': [ '../tools', ], + }, + }, ], 'conditions': [ ['skia_shared_lib', |