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

Unified Diff: webkit/webkit.gyp

Issue 42340: Update the gyp Linux build: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 12226)
+++ webkit/webkit.gyp (working copy)
@@ -3942,6 +3942,9 @@
},
'conditions': [
['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
'sources!': [
# Not yet ported to Linux.
'../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp',
@@ -3955,9 +3958,11 @@
['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'],
['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'],
],
- # for:
- # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
- 'cflags': ['-Wno-multichar'],
+ 'cflags': [
+ # -Wno-multichar for:
+ # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
+ '-Wno-multichar',
+ ],
# TODO(sgk): unnecessary once common.gypi gets Linux settings
# necessary to avoid build failure due to warnings generated by:
# ../third_party/WebKit/WebCore/dom/Document.cpp
@@ -4119,6 +4124,11 @@
'../third_party/WebKit/WebKit/chromium/src/WebURL.cpp',
],
'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ }],
['OS=="mac"', {
'sources!': [
'../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
@@ -4411,6 +4421,10 @@
],
'conditions': [
['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:pangoft2',
+ ],
'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