OLD | NEW |
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 |
11 'EntryPointSymbol': 'mainCRTStartup', | 11 'EntryPointSymbol': 'mainCRTStartup', |
12 }, | 12 }, |
13 }, | 13 }, |
14 'conditions': [ | 14 'conditions': [ |
15 [ 'skia_os == "android" and not skia_android_framework', { | 15 [ 'skia_os == "android"', { |
| 16 'conditions': [ |
| 17 ['skia_android_framework == 0', { |
| 18 'dependencies': [ |
| 19 'android_deps.gyp:Android_EntryPoint', |
| 20 'skia_launcher.gyp:skia_launcher', |
| 21 ], |
| 22 }], |
| 23 ], |
16 'dependencies': [ | 24 'dependencies': [ |
17 'android_deps.gyp:Android_EntryPoint', | 25 'android_output.gyp:android_output', |
18 'skia_launcher.gyp:skia_launcher', | |
19 ], | 26 ], |
20 }], | 27 }], |
21 [ 'skia_os == "nacl"', { | 28 [ 'skia_os == "nacl"', { |
22 'dependencies': [ | 29 'dependencies': [ |
23 'nacl.gyp:nacl_interface', | 30 'nacl.gyp:nacl_interface', |
24 ], | 31 ], |
25 }], | 32 }], |
26 ['skia_os == "ios"', { | 33 ['skia_os == "ios"', { |
27 'target_conditions': [ | 34 'target_conditions': [ |
28 ['_type == "executable"', { | 35 ['_type == "executable"', { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 69 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |
63 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', | 70 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', |
64 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', | 71 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', |
65 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 72 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', |
66 ], | 73 ], |
67 }, | 74 }, |
68 }], | 75 }], |
69 ], | 76 ], |
70 }, | 77 }, |
71 } | 78 } |
OLD | NEW |