From 012adff3836f208288c09323c0de2f93117c13c9 Mon Sep 17 00:00:00 2001 From: "bradnelson@chromium.org" Date: Sat, 18 Oct 2008 00:30:22 +0000 Subject: Rolling back CL 3578, discovered hammer.bat had not been updated yet. Review URL: http://codereview.chromium.org/7507 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/npapi_layout_test_plugin/SConscript | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'webkit/tools/npapi_layout_test_plugin') diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript index 329fb92..4b2da51 100644 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ b/webkit/tools/npapi_layout_test_plugin/SConscript @@ -45,7 +45,23 @@ if env['PLATFORM'] == 'win32': ], ) - dll = env.ChromeSharedLibrary('npapi_layout_test_plugin', input_files) +if env['PLATFORM'] == 'win32': + dll = env.ChromeSharedLibrary([ + 'npapi_layout_test_plugin', + 'npapi_layout_test_plugin.lib', + 'npapi_layout_test_plugin.ilk', + 'npapi_layout_test_plugin.pdb' + ], input_files) + + # TODO(sgk): goes away when env.ChromeSharedLibrary() knows how + # to do this for us. + env.Install('$LIBS_DIR', dll[1]) +else: + dll = env.ChromeSharedLibrary(['npapi_layout_test_plugin'], input_files) -i = env.Install('$MAIN_DIR/Hammer', dll[0]) +i = env.Install('$TARGET_ROOT/plugins', dll) env.Alias('webkit', i) + +i = env.Install('$TARGET_ROOT', dll) +env.Alias('webkit', i) + -- cgit v1.1