diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 04:22:23 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 04:22:23 +0000 |
| commit | 69acda8a4dd801608af986d95df16851ce8c50e5 (patch) | |
| tree | bd36b9c658c8513accb6c8b4b2fed70158126776 /webkit/webkit.gyp | |
| parent | deb6e0ed6dd06c90044b0ba199149872fd60b75f (diff) | |
| download | chromium_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/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 671d244..4423c59 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -110,6 +110,12 @@ # Match Safari and Mozilla on Windows. 'WEBCORE_NAVIGATOR_PLATFORM="Win32"', ], + 'webcore_include_dirs': [ + '../third_party/WebKit/WebCore/page/win', + '../third_party/WebKit/WebCore/platform/graphics/win', + '../third_party/WebKit/WebCore/platform/text/win', + '../third_party/WebKit/WebCore/platform/win', + ], }, { # else: OS!="win" 'feature_defines': [ 'ENABLE_VIDEO=0' @@ -3999,7 +4005,15 @@ }, }], ['OS=="win"', { - 'sources/': [['exclude', 'Posix\\.cpp$']], + 'sources/': [ + ['exclude', 'Posix\\.cpp$'], + ['include', '/opentype/'], + ['include', '/TransparencyWin\\.cpp$'], + ['include', '/SkiaFontWin\\.cpp$'], + ], + 'sources!': [ + '../third_party/WebKit/WebCore/platform/network/ResourceHandle.cpp', + ], 'defines': [ '__PRETTY_FUNCTION__=__FUNCTION__', 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', @@ -4343,6 +4357,13 @@ ], }, { # else: OS=="win" 'sources/': [['exclude', '_posix\\.cc$']], + 'dependencies': [ + 'activex_shim/activex_shim.gyp:activex_shim', + 'default_plugin/default_plugin.gyp:default_plugin', + ], + 'sources!': [ + 'glue/plugins/plugin_stubs.cc', + ], }], ], }, |