diff options
| author | gangji@google.com <gangji@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 19:45:29 +0000 |
|---|---|---|
| committer | gangji@google.com <gangji@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-02 19:45:29 +0000 |
| commit | 6b08624df594512b707f76d5954b2bc04e7a2e10 (patch) | |
| tree | 7d0bc1a631f4c1a05d3676157238d0dc9318bd70 /o3d/build/libs.gyp | |
| parent | 4a9b5fe12f3a6b0201711c0ce7fe03fa04d904c2 (diff) | |
| download | chromium_src-6b08624df594512b707f76d5954b2bc04e7a2e10.zip chromium_src-6b08624df594512b707f76d5954b2bc04e7a2e10.tar.gz chromium_src-6b08624df594512b707f76d5954b2bc04e7a2e10.tar.bz2 | |
Adding cairo and pixman build to windows.
Review URL: http://codereview.chromium.org/6594091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build/libs.gyp')
| -rw-r--r-- | o3d/build/libs.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index bdee033..8a3f2f9 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -40,7 +40,19 @@ ], [ 'OS=="win"', { - #TODO(fransiskusx): Link to Cairo on Win/Mac as a static library, + 'all_dependent_settings': { + 'defines': [ + 'CAIRO_WIN32_STATIC_BUILD' + ], + 'include_dirs': [ + '../../<(cairodir)/src', + '../build/misc' + ], + }, + 'dependencies': [ + 'cairo.gyp:cairo', + 'pixman.gyp:pixman', + ], }, ], ], |