diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 23:31:55 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 23:31:55 +0000 |
| commit | c24e5d031e408a81cd6a004353b4d3065d29046d (patch) | |
| tree | c9bd374cca48525c6ca6dfc632ffec298336089b /skia/skia.gyp | |
| parent | 77e802a962b6e3104a43fb8b9c289584f408901e (diff) | |
| download | chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.zip chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.tar.gz chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.tar.bz2 | |
Fix linking with gold by cleaning up lib dependencies.
- Remove pangoft2, we don't use it anywhere.
- Add gdk, fontconfig and freetype2 as dependencies of skia. Gdk is
used in platform_canvas_linux.
- X11, Xrender and Xext are used by the IPC system, so everything that
depends on common, needs to link in those libs. By moving the
link_settings line into the libcommon.a target, all projects
inherit these.
Review URL: http://codereview.chromium.org/60070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index ae3ccd7..bdf2de1 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -688,7 +688,9 @@ }], [ 'OS == "linux"', { 'dependencies': [ - '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:gdk', + '../build/linux/system.gyp:fontconfig', + '../build/linux/system.gyp:freetype2', ], 'cflags': [ '-Wno-unused', |