diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
| commit | 113736ca60dff0d00fe7ae03eeb095ac50af48c5 (patch) | |
| tree | e22ec778bdc601bbdfcee42d45f507e6a6da9de5 /webkit/glue | |
| parent | 968e56aeb9ac7c51f7b1cb36cd7a5586fd13e966 (diff) | |
| download | chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.zip chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.gz chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.bz2 | |
Checking in the rest of the .lib changes, previous commit was only done from chrome/ and only got those SConscript files.
R=evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index 7566c65..c238f4d 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -48,11 +48,15 @@ input_files = [ 'plugin_test.cc', 'plugin_window_size_test.cc', 'npapi_test.def', - - '$BASE_DIR/base.lib', ] env.Append( + LIBS = [ + 'base', + ], +) + +env.Append( CCFLAGS = [ '/TP', '/wd4800', @@ -66,6 +70,7 @@ env.Append( ], LINKFLAGS = [ + '/INCREMENTAL', '/DELAYLOAD:"dwmapi.dll"', '/DELAYLOAD:"uxtheme.dll"', '/FIXED:No', @@ -79,9 +84,13 @@ env.Append( ) dll = env.ChromeSharedLibrary(['npapi_test_plugin', + 'npapi_test_plugin.lib', 'npapi_test_plugin.ilk', 'npapi_test_plugin.pdb'], input_files) +# TODO(sgk): goes away once ChromeSharedLibrary does this for us. +env.Install('$LIBS_DIR', dll[1]) + i = env.Install('$TARGET_ROOT', dll) env.Alias('webkit', i) |