diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:48:10 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:48:10 +0000 |
| commit | 8327443a5a5808f784e5fdc693e6d6f1f1beb032 (patch) | |
| tree | cfaaab3fab2de21649f7a6d1c02ca9461503d199 /webkit/glue | |
| parent | 40f9788b1c12179b49260aee91fcfe04e219feb4 (diff) | |
| download | chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.zip chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.tar.gz chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.tar.bz2 | |
WebKit merge hits the SCons build, the sequel:
* Un-revert r3063 (basic file list updates).
* Un-revert r3079 (os-win32 subdirectory).
* Add icu.lib to the npapi_test_plugin.dll link.
* Add libpng.lib to the port.lib link.
* Updates for recently un-forked files.
* Incorporate Linux fixes from phajdan.jr (many thanks):
* Add libxml/linux/include to relevant CPPPATH lists.
* Use -Wno-error to suppress warnings-as-errors.
* Re-order lines in ExceptionContext.
* Remove unused WebCore::SharedBuffer declaration in SkiaUtils.h.
* Spelling fix: V8CSSSTyleDeclaration.h => V8CSSStyleDeclaration.h
Review URL: http://codereview.chromium.org/7024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index 4a17a15..3e90365 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -32,6 +32,7 @@ if env['PLATFORM'] == 'win32': env.Append( LIBS = [ 'base', + 'icu', ], ) |