diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 19:52:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 19:52:38 +0000 |
| commit | 1e4a731e18cc375d537776576d379d4349c0b86c (patch) | |
| tree | 68729e55b0a96af0fcbb99258e943f0d1ba63857 /webkit | |
| parent | b2510af5c03ec40348a0042d0b08f211b3428f0a (diff) | |
| download | chromium_src-1e4a731e18cc375d537776576d379d4349c0b86c.zip chromium_src-1e4a731e18cc375d537776576d379d4349c0b86c.tar.gz chromium_src-1e4a731e18cc375d537776576d379d4349c0b86c.tar.bz2 | |
Preliminary fixes to enable link dependent objects.
BUG=22926
TEST=still builds
Review URL: http://codereview.chromium.org/231020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/extensions/v8/gears_extension.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/webkit/extensions/v8/gears_extension.cc b/webkit/extensions/v8/gears_extension.cc index 92405ed..5bcd6cd 100644 --- a/webkit/extensions/v8/gears_extension.cc +++ b/webkit/extensions/v8/gears_extension.cc @@ -7,11 +7,11 @@ namespace extensions_v8 { -const char* kGearsExtensionName = "v8/Gears"; +const char* const kGearsExtensionName = "v8/Gears"; // Note: when a page touches the "google.gears.factory" object, this script // touches the DOM. We expect the DOM to be available at that time. -const char* kGearsExtensionScript = +const char* const kGearsExtensionScript = "var google;" "if (!google)" " google = {};" diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 56cc143..a7e47a1 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -484,7 +484,7 @@ # AdditionalDependencies, which tries to do the copy before # the file is built... # - #}, { # OS == "win" + }, { # OS == "win" # # The old VS build would explicitly copy the .dll into the # # plugins subdirectory like this. It might be possible to # # use the 'product_dir' setting to build directly into @@ -496,6 +496,11 @@ # 'files': ['<(PRODUCT_DIR)/npapi_layout_test_plugin.dll'], # }, # ], + 'link_settings': { + 'libraries': [ + "winmm.lib", + ], + }, }], ['OS=="mac"', { 'product_name': 'TestNetscapePlugIn', |