diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
| commit | b5c72b82b5b19a3268ea5df60b79322f7f779027 (patch) | |
| tree | 27bbd22eccca76f350d0e6350e78dcd20f297104 /skia | |
| parent | c04057c9f62073cd266eebe462dd777f8fe6d7a5 (diff) | |
| download | chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.zip chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.gz chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.bz2 | |
Solaris: Second set adding in Solaris as an OS option
TEST=compiles
BUG=30101
Patch by James Choi <jchoi42@pha.jhu.edu>.
Review URL: http://codereview.chromium.org/606075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/platform_canvas.h | 3 | ||||
| -rw-r--r-- | skia/ext/platform_device.h | 3 | ||||
| -rw-r--r-- | skia/skia.gyp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h index b624249..4c47466 100644 --- a/skia/ext/platform_canvas.h +++ b/skia/ext/platform_canvas.h @@ -47,7 +47,8 @@ class PlatformCanvas : public SkCanvas { // For two-part init, call if you use the no-argument constructor above bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL); -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ + defined(__Solaris__) // Linux --------------------------------------------------------------------- // Construct a canvas from the given memory region. The memory is not cleared diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h index d85786b..39710ed 100644 --- a/skia/ext/platform_device.h +++ b/skia/ext/platform_device.h @@ -12,7 +12,8 @@ #include "skia/ext/platform_device_win.h" #elif defined(__APPLE__) #include "skia/ext/platform_device_mac.h" -#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ + defined(__Solaris__) #include "skia/ext/platform_device_linux.h" #endif diff --git a/skia/skia.gyp b/skia/skia.gyp index 41da282..d85f2a1 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -564,7 +564,7 @@ ['exclude', '_mac\\.(cc|cpp|mm?)$'], ['exclude', '/mac/'] ], }], - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd"', { + [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ], 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', @@ -588,7 +588,7 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'dependencies': [ '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:fontconfig', |