summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 04:22:23 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 04:22:23 +0000
commit69acda8a4dd801608af986d95df16851ce8c50e5 (patch)
treebd36b9c658c8513accb6c8b4b2fed70158126776 /webkit/tools/test_shell
parentdeb6e0ed6dd06c90044b0ba199149872fd60b75f (diff)
downloadchromium_src-69acda8a4dd801608af986d95df16851ce8c50e5.zip
chromium_src-69acda8a4dd801608af986d95df16851ce8c50e5.tar.gz
chromium_src-69acda8a4dd801608af986d95df16851ce8c50e5.tar.bz2
Fixes to gyp files to get test_shell building on windows from a gyp project (doesn't run correctly yet).
Switched all uses of windows system libraries that assumed they were in the include path to use -l (which will be supported on windows in a separate change). Review URL: http://codereview.chromium.org/27362 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/test_shell.gyp11
1 files changed, 8 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 6134283..8970991 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -89,10 +89,15 @@
]
}],
['OS=="win"', {
- 'include_dirs': [
- '../../../breakpad/src',
- ],
'msvs_disabled_warnings': [ 4800 ],
+ 'link_settings': {
+ 'libraries': [
+ '-lcomctl32.lib',
+ ],
+ },
+ 'dependencies': [
+ '../../../breakpad/breakpad.gyp:breakpad_handler',
+ ],
}, { # OS!=win
'sources/': [
['exclude', '_win\\.cc$']