summaryrefslogtreecommitdiffstats
path: root/webkit/activex_shim
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 20:45:47 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 20:45:47 +0000
commitfc78fd42b81a97d3d15419e679f3ff9e0f470d9c (patch)
treebde32a7774d8d727d42a011ffefede44ebfceb6c /webkit/activex_shim
parent34004eea5940a37644ce70707470647091958cd2 (diff)
downloadchromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.zip
chromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.tar.gz
chromium_src-fc78fd42b81a97d3d15419e679f3ff9e0f470d9c.tar.bz2
Allows scons build to use local copy of platformsdk if one is not bundled side-by-side.
Review URL: http://codereview.chromium.org/12915 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/activex_shim')
-rw-r--r--webkit/activex_shim/SConscript6
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript
index 8845906..78663be 100644
--- a/webkit/activex_shim/SConscript
+++ b/webkit/activex_shim/SConscript
@@ -23,9 +23,8 @@ env.Append(
'/WX',
'/Wp64',
],
-# TODO(bradnelson): Scons should really have a way to handle this.
- ARFLAGS = [
- '/LIBPATH:$PLATFORMSDK_VISTA_REL', 'Urlmon.Lib',
+ LIBS = [
+ 'Urlmon',
],
)
@@ -41,4 +40,3 @@ input_files = [
]
env.ChromeStaticLibrary('activex_shim', input_files)
-