summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 22:06:54 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-23 22:06:54 +0000
commit6a654d45598c2631f0009101a553fd14b866b62f (patch)
treeafd71c88f45b680bf30040047075fe259d5c767c /courgette
parentfcc2d5f0e4ff841a6af7cc7f5834985f833cf935 (diff)
downloadchromium_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 'courgette')
-rw-r--r--courgette/courgette.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 69965b3..f4f1c71 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -106,7 +106,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ [ 'toolkit_uses_gtk == 1', {
'dependencies': [
# Workaround for gyp bug 69.
# Needed to handle the #include chain:
@@ -132,7 +132,7 @@
'../testing/gtest.gyp:gtest',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ [ 'toolkit_uses_gtk == 1', {
'dependencies': [
# Workaround for gyp bug 69.
# Needed to handle the #include chain: