Index: content/content_shell.gypi |
=================================================================== |
--- content/content_shell.gypi (revision 103728) |
+++ content/content_shell.gypi (working copy) |
@@ -5,8 +5,8 @@ |
{ |
'targets': [ |
{ |
- 'target_name': 'content_shell', |
- 'type': 'executable', |
+ 'target_name': 'content_shell_lib', |
+ 'type': 'static_library', |
'defines!': ['CONTENT_IMPLEMENTATION'], |
'variables': { |
'chromium_code': 1, |
@@ -64,7 +64,8 @@ |
'shell/shell_content_utility_client.h', |
'shell/shell_download_manager_delegate.cc', |
'shell/shell_download_manager_delegate.h', |
- 'shell/shell_main.cc', |
+ 'shell/shell_main_delegate.cc', |
+ 'shell/shell_main_delegate.h', |
'shell/shell_resource_context.cc', |
'shell/shell_resource_context.h', |
'shell/shell_url_request_context_getter.cc', |
@@ -85,6 +86,54 @@ |
'resource_include_dirs': [ |
jam
2011/10/04 22:21:13
do you need this block (86-105) twice, here and be
Paweł Hajdan Jr.
2011/10/04 23:19:48
Done.
|
'<(SHARED_INTERMEDIATE_DIR)/webkit', |
], |
+ 'dependencies': [ |
+ '<(DEPTH)/net/net.gyp:net_resources', |
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', |
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', |
+ ], |
+ 'configurations': { |
+ 'Debug_Base': { |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
+ }, |
+ }, |
+ }, |
+ }, |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'content_shell', |
+ 'type': 'executable', |
+ 'defines!': ['CONTENT_IMPLEMENTATION'], |
+ 'variables': { |
+ 'chromium_code': 1, |
+ }, |
+ 'dependencies': [ |
+ 'content_shell_lib', |
+ ], |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ 'sources': [ |
+ 'shell/shell_main.cc', |
+ ], |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
+ }, |
+ }, |
+ 'conditions': [ |
+ ['OS=="win" and win_use_allocator_shim==1', { |
+ 'dependencies': [ |
+ '../base/allocator/allocator.gyp:allocator', |
+ ], |
+ }], |
+ ['OS=="win"', { |
+ 'resource_include_dirs': [ |
+ '<(SHARED_INTERMEDIATE_DIR)/webkit', |
+ ], |
'sources': [ |
'shell/resource.h', |
'shell/shell.rc', |