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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 22325015: Load resources from chrome.pak instead of chrome.dll on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 'dependencies': [ 95 'dependencies': [
96 'chrome_user32_delay_imports', 96 'chrome_user32_delay_imports',
97 ], 97 ],
98 },], 98 },],
99 ['OS=="win"', { 99 ['OS=="win"', {
100 'product_name': 'chrome', 100 'product_name': 'chrome',
101 'dependencies': [ 101 'dependencies': [
102 # On Windows, link the dependencies (libraries) that make 102 # On Windows, link the dependencies (libraries) that make
103 # up actual Chromium functionality into this .dll. 103 # up actual Chromium functionality into this .dll.
104 'chrome_dll_pdb_workaround', 104 'chrome_dll_pdb_workaround',
105 'chrome_resources.gyp:chrome_resources',
106 'chrome_version_resources', 105 'chrome_version_resources',
107 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
108 '../crypto/crypto.gyp:crypto', 106 '../crypto/crypto.gyp:crypto',
109 '../printing/printing.gyp:printing', 107 '../printing/printing.gyp:printing',
110 '../net/net.gyp:net_resources',
111 '../third_party/cld/cld.gyp:cld', 108 '../third_party/cld/cld.gyp:cld',
112 '../ui/views/views.gyp:views', 109 '../ui/views/views.gyp:views',
113 '../webkit/webkit_resources.gyp:webkit_resources',
114 ], 110 ],
115 'sources': [ 111 'sources': [
116 'app/chrome_command_ids.h', 112 'app/chrome_command_ids.h',
117 'app/chrome_dll.rc', 113 'app/chrome_dll.rc',
118 'app/chrome_dll_resource.h', 114 'app/chrome_dll_resource.h',
119 'app/chrome_main.cc', 115 'app/chrome_main.cc',
120 'app/chrome_main_delegate.cc', 116 'app/chrome_main_delegate.cc',
121 'app/chrome_main_delegate.h', 117 'app/chrome_main_delegate.h',
122 'app/delay_load_hook_win.cc', 118 'app/delay_load_hook_win.cc',
123 'app/delay_load_hook_win.h', 119 'app/delay_load_hook_win.h',
124 120
125 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ', 121 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc ',
126 '../base/win/dllmain.cc', 122 '../base/win/dllmain.cc',
127 123
128 '../ui/resources/cursors/aliasb.cur', 124 '../ui/resources/cursors/aliasb.cur',
129 '../ui/resources/cursors/cell.cur', 125 '../ui/resources/cursors/cell.cur',
130 '../ui/resources/cursors/col_resize.cur', 126 '../ui/resources/cursors/col_resize.cur',
131 '../ui/resources/cursors/copy.cur', 127 '../ui/resources/cursors/copy.cur',
132 '../ui/resources/cursors/none.cur', 128 '../ui/resources/cursors/none.cur',
133 '../ui/resources/cursors/row_resize.cur', 129 '../ui/resources/cursors/row_resize.cur',
134 '../ui/resources/cursors/vertical_text.cur', 130 '../ui/resources/cursors/vertical_text.cur',
135 '../ui/resources/cursors/zoom_in.cur', 131 '../ui/resources/cursors/zoom_in.cur',
136 '../ui/resources/cursors/zoom_out.cur', 132 '../ui/resources/cursors/zoom_out.cur',
137
138 # TODO: It would be nice to have these pulled in
139 # automatically from direct_dependent_settings in
140 # their various targets (net.gyp:net_resources, etc.),
141 # but that causes errors in other targets when
142 # resulting .res files get referenced multiple times.
143 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
144 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc' ,
145 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
146 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
147 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
148 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_reso urces.rc',
149 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
150 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resource s.rc',
151 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
152 ], 133 ],
153 'include_dirs': [ 134 'include_dirs': [
154 '<(DEPTH)/third_party/wtl/include', 135 '<(DEPTH)/third_party/wtl/include',
155 ], 136 ],
156 'configurations': { 137 'configurations': {
157 'Debug_Base': { 138 'Debug_Base': {
158 'msvs_settings': { 139 'msvs_settings': {
159 'VCLinkerTool': { 140 'VCLinkerTool': {
160 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 141 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
161 }, 142 },
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 '<@(chromium_child_dependencies)', 338 '<@(chromium_child_dependencies)',
358 '../content/content.gyp:content_app_child', 339 '../content/content.gyp:content_app_child',
359 '../content/content.gyp:content_worker', 340 '../content/content.gyp:content_worker',
360 'chrome_version_resources', 341 'chrome_version_resources',
361 'policy_path_parser', 342 'policy_path_parser',
362 ], 343 ],
363 'defines': [ 344 'defines': [
364 'CHROME_MULTIPLE_DLL_CHILD', 345 'CHROME_MULTIPLE_DLL_CHILD',
365 ], 346 ],
366 'sources': [ 347 'sources': [
367 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
368 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
369 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 348 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
370 'app/chrome_main.cc', 349 'app/chrome_main.cc',
371 'app/chrome_main_delegate.cc', 350 'app/chrome_main_delegate.cc',
372 'app/chrome_main_delegate.h', 351 'app/chrome_main_delegate.h',
373 ], 352 ],
374 }, # target chrome_child_dll 353 }, # target chrome_child_dll
375 ], 354 ],
376 }], 355 }],
377 ], 356 ],
378 } 357 }
OLDNEW
« no previous file with comments | « no previous file | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698