diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 19:57:22 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 19:57:22 +0000 |
| commit | 09c6dec4e18784861660f716d038035be9540601 (patch) | |
| tree | b5e5419aff269cb15c13ea6a3eab0c90a527ef4a /skia/skia.gyp | |
| parent | 66980a010042f2e44efb21360e662daeae8c5668 (diff) | |
| download | chromium_src-09c6dec4e18784861660f716d038035be9540601.zip chromium_src-09c6dec4e18784861660f716d038035be9540601.tar.gz chromium_src-09c6dec4e18784861660f716d038035be9540601.tar.bz2 | |
Add file icons to chrome://downloads/ on the Mac. Add Skia helper
CGImageToSkBitmap().
Patch by Robert Sesek <rsesek@bluestatic.org>
Review URL: http://codereview.chromium.org/118488
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rwxr-xr-x | skia/skia.gyp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 912e80a..a3e55b2 100755 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -525,7 +525,7 @@ 'ext/SkTypeface_fake.cpp', 'ext/skia_utils.cc', 'ext/skia_utils.h', - 'ext/skia_utils_mac.cc', + 'ext/skia_utils_mac.mm', 'ext/skia_utils_mac.h', 'ext/skia_utils_win.cc', 'ext/skia_utils_win.h', @@ -608,9 +608,14 @@ 'defines': [ 'SK_BUILD_FOR_MAC', ], - 'include_dirs': [ - '../third_party/skia/include/utils/mac', - ], + 'include_dirs': [ + '../third_party/skia/include/utils/mac', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + ], + }, }], [ 'OS == "win"', { 'sources!': [ |