diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 06:21:10 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 06:21:10 +0000 |
| commit | 1e40bd2cc89252ef17cfc3d17ebad958f588c46a (patch) | |
| tree | fdfc6039c6dd0b7fba2e65ad2d5f26448531a60b /chrome/chrome.gyp | |
| parent | c5814fb0aea28259df5a46ca0008de7bd01ee8dc (diff) | |
| download | chromium_src-1e40bd2cc89252ef17cfc3d17ebad958f588c46a.zip chromium_src-1e40bd2cc89252ef17cfc3d17ebad958f588c46a.tar.gz chromium_src-1e40bd2cc89252ef17cfc3d17ebad958f588c46a.tar.bz2 | |
Updates prior to cutting over chrome.dll to gyp generation:
* Add dependency on the 'theme_dll' target, commented out
to avoid a problem with default.lib not being generated.
* Make the location of the generated chrome_dll_version.rc file consistent
with other uses of SHARED_INTERMEDIATE_DIR.
* Add the necessary generated *_resources.rc to 'sources'.
* Remove 'process_outputs_as_sources' from the 'chrome_dll_version'
action. It's now that it's in its own target.
* Add settings from chrome\app\chrome_dll.vsprops.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 7576759..bcae8f0 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3825,6 +3825,9 @@ 'chrome_dll_version', 'chrome_resources', 'installer/installer.gyp:installer_util_strings', + # TODO(sgk): causes problems because theme_dll doesn't + # actually generate default.lib, but now expects it. + #'theme_dll', 'worker', '../net/net.gyp:net_resources', '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', @@ -3832,6 +3835,12 @@ '../webkit/webkit.gyp:webkit_resources', '../gears/gears.gyp:gears', ], + 'defines': [ + 'CHROME_DLL', + 'BROWSER_DLL', + 'RENDERER_DLL', + 'PLUGIN_DLL', + ], 'sources': [ 'app/chrome_dll.rc', 'app/chrome_dll_main.cc', @@ -3846,6 +3855,19 @@ '../webkit/glue/resources/vertical_text.cur', '../webkit/glue/resources/zoom_in.cur', '../webkit/glue/resources/zoom_out.cur', + + # TODO: It would be nice to have these pulled in + # automatically from direct_dependent_settings in + # their various targets (net.gyp:net_resources, etc.), + # but that causes errors in other targets when + # resulting .res files get referenced multiple times. + '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', + # TODO(sgk): left-over from pre-gyp build, figure out # if we still need them and/or how to update to gyp. #'app/check_dependents.bat', @@ -3853,6 +3875,8 @@ ], 'msvs_settings': { 'VCLinkerTool': { + 'BaseAddress': '0x01c30000', + 'DelayLoadDLLs': 'crypt32.dll;cryptui.dll;winhttp.dll;wininet.dll;wsock32.dll;ws2_32.dll;winspool.drv;comdlg32.dll;imagehlp.dll;psapi.dll;urlmon.dll;imm32.dll', 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency). 'SubSystem': '2', @@ -3919,7 +3943,6 @@ '<(template_input_path)', '<@(_outputs)', ], - 'process_outputs_as_sources': 1, 'message': 'Generating version information in <(_outputs)' }, ], |