diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
| commit | 6a654d45598c2631f0009101a553fd14b866b62f (patch) | |
| tree | afd71c88f45b680bf30040047075fe259d5c767c /skia/skia.gyp | |
| parent | fcc2d5f0e4ff841a6af7cc7f5834985f833cf935 (diff) | |
| download | chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.zip chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.gz chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.bz2 | |
Final gyp patch to make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS.
Review URL: http://codereview.chromium.org/7055003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index b158d91..3c7bd12 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -724,7 +724,7 @@ ['exclude', '_mac\\.(cc|cpp|mm?)$'], ['exclude', '/mac/'] ], }], - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { + [ 'toolkit_uses_gtk == 0', { 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ], 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', @@ -760,7 +760,7 @@ 'SK_RESTRICT=', ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + [ 'toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:fontconfig', @@ -891,7 +891,7 @@ '../third_party/skia/src/core', ], 'conditions': [ - [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd") and target_arch != "arm"', { + [ 'os_posix == 1 and OS != "mac" and target_arch != "arm"', { 'cflags': [ '-msse2', ], |