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

Side by Side Diff: gyp/apptype_console.gypi

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/SimpleiOSApp.gyp ('k') | gyp/common_conditions.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 # target_defaults used for executable targets that generate a console app 1 # target_defaults used for executable targets that generate a console app
2 { 2 {
3 'target_defaults': { 3 'target_defaults': {
4 'msvs_settings': { 4 'msvs_settings': {
5 'VCLinkerTool': { 5 'VCLinkerTool': {
6 #Allows for creation / output to console. 6 #Allows for creation / output to console.
7 #Console (/SUBSYSTEM:CONSOLE) 7 #Console (/SUBSYSTEM:CONSOLE)
8 'SubSystem': '1', 8 'SubSystem': '1',
9 9
10 #Console app, use main/wmain 10 #Console app, use main/wmain
(...skipping 16 matching lines...) Expand all
27 'target_conditions': [ 27 'target_conditions': [
28 ['_type == "executable"', { 28 ['_type == "executable"', {
29 'mac_bundle' : 1, 29 'mac_bundle' : 1,
30 }], 30 }],
31 ], 31 ],
32 'include_dirs' : [ 32 'include_dirs' : [
33 '../experimental/iOSSampleApp/Shared', 33 '../experimental/iOSSampleApp/Shared',
34 '../include/views', 34 '../include/views',
35 '../include/xml', 35 '../include/xml',
36 '../include/utils/mac', 36 '../include/utils/mac',
37 '../src/views/mac',
37 ], 38 ],
38 'sources': [ 39 'sources': [
39 '../src/views/ios/SkOSWindow_iOS.mm', 40 '../src/views/ios/SkOSWindow_iOS.mm',
40 '../src/views/mac/SkEventNotifier.h',
41 '../src/views/mac/SkEventNotifier.mm', 41 '../src/views/mac/SkEventNotifier.mm',
42 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
43 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', 42 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
44 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
45 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', 43 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
46 '../experimental/iOSSampleApp/Shared/SkUIView.h',
47 '../experimental/iOSSampleApp/Shared/SkUIView.mm', 44 '../experimental/iOSSampleApp/Shared/SkUIView.mm',
48 '../experimental/iOSSampleApp/Shared/skia_ios.mm', 45 '../experimental/iOSSampleApp/Shared/skia_ios.mm',
49 '../experimental/SimpleiOSApp/SimpleApp.h',
50 '../experimental/SimpleiOSApp/SimpleApp.mm', 46 '../experimental/SimpleiOSApp/SimpleApp.mm',
51 ], 47 ],
52 'dependencies': [ 48 'dependencies': [
53 'views.gyp:views', 49 'views.gyp:views',
54 'xml.gyp:xml', 50 'xml.gyp:xml',
55 ], 51 ],
56 'link_settings': { 52 'link_settings': {
57 'libraries': [ 53 'libraries': [
58 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 54 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
59 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 55 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
60 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 56 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
61 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', 57 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
62 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', 58 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
63 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 59 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
64 ], 60 ],
65 }, 61 },
66 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.x cconfig', 62 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.x cconfig',
67 'mac_bundle_resources' : [ 63 'mac_bundle_resources' : [
68 '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', 64 '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib',
69 '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', 65 '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib',
70 ], 66 ],
71 'xcode_settings' : { 67 'xcode_settings' : {
72 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist', 68 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist',
73 }, 69 },
74 }], 70 }],
75 ], 71 ],
76 }, 72 },
77 } 73 }
OLDNEW
« no previous file with comments | « gyp/SimpleiOSApp.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698