Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: webkit/webkit.gyp

Issue 27362: Fixes to gyp files to get test_shell building on windows from a gyp project (... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/webkit.gyp
===================================================================
--- webkit/webkit.gyp (revision 10746)
+++ webkit/webkit.gyp (working copy)
@@ -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',
@@ -4342,6 +4356,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',
+ ],
}],
],
},
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698