Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Side by Side Diff: gyp/SimpleiOSApp.gyp

Issue 226413005: get iOS building again (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: just cast Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/SampleApp.gyp ('k') | gyp/apptype_console.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'conditions' : [ 2 'conditions' : [
3 [ 'skia_os != "ios"', { 3 [ 'skia_os != "ios"', {
4 'error': '<!(set GYP_DEFINES=\"skia_os=\'ios\'\")' 4 'error': '<!(set GYP_DEFINES=\"skia_os=\'ios\'\")'
5 }], 5 }],
6 ], 6 ],
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'SimpleiOSApp', 9 'target_name': 'SimpleiOSApp',
10 'type': 'executable', 10 'type': 'executable',
11 'mac_bundle' : 1, 11 'mac_bundle' : 1,
12 'include_dirs' : [ 12 'include_dirs' : [
13 '../experimental/iOSSampleApp/Shared', 13 '../experimental/iOSSampleApp/Shared',
14 '../src/views/mac',
14 ], 15 ],
15 'sources': [ 16 'sources': [
16 '../src/views/ios/SkOSWindow_iOS.mm', 17 '../src/views/ios/SkOSWindow_iOS.mm',
17 '../src/views/mac/SkEventNotifier.h',
18 '../src/views/mac/SkEventNotifier.mm', 18 '../src/views/mac/SkEventNotifier.mm',
19 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
20 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', 19 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
21 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
22 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', 20 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
23 '../experimental/iOSSampleApp/Shared/SkUIView.h',
24 '../experimental/iOSSampleApp/Shared/SkUIView.mm', 21 '../experimental/iOSSampleApp/Shared/SkUIView.mm',
25 '../experimental/iOSSampleApp/Shared/skia_ios.mm', 22 '../experimental/iOSSampleApp/Shared/skia_ios.mm',
26 '../experimental/SimpleiOSApp/SimpleApp.h',
27 '../experimental/SimpleiOSApp/SimpleApp.mm', 23 '../experimental/SimpleiOSApp/SimpleApp.mm',
28 '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist', 24 '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist',
29 ], 25 ],
30 'dependencies': [ 26 'dependencies': [
31 'skia_lib.gyp:skia_lib', 27 'skia_lib.gyp:skia_lib',
32 'views.gyp:views', 28 'views.gyp:views',
33 'xml.gyp:xml', 29 'xml.gyp:xml',
34 ], 30 ],
35 'link_settings': { 31 'link_settings': {
36 'libraries': [ 32 'libraries': [
(...skipping 17 matching lines...) Expand all
54 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist ', 50 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist ',
55 }, 51 },
56 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcc onfig', 52 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcc onfig',
57 'mac_bundle_resources' : [ 53 'mac_bundle_resources' : [
58 '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', 54 '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib',
59 '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', 55 '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib',
60 ], 56 ],
61 }, 57 },
62 ], 58 ],
63 } 59 }
OLDNEW
« no previous file with comments | « gyp/SampleApp.gyp ('k') | gyp/apptype_console.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698