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 /remoting | |
| 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 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index b0ad56b..2c68af1 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -21,7 +21,7 @@ 'plugin_extension': 'plugin', 'plugin_prefix': '', }], - ['OS=="linux"', { + ['os_posix == 1 and OS != "mac"', { 'plugin_extension': 'so', 'plugin_prefix': 'lib', }], @@ -46,7 +46,7 @@ }, 'conditions': [ - ['OS=="linux" or OS=="mac"', { + ['os_posix == 1', { 'targets': [ # Simple webserver for testing remoting client plugin. { @@ -60,7 +60,7 @@ }], # TODO(hclam): Enable this target for mac. - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['use_x11 == 1', { 'targets': [ { @@ -345,7 +345,7 @@ 'host/user_authenticator_win.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -575,7 +575,7 @@ '..', ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'os_posix == 1 and OS != "mac"', { 'cflags': [ '-msse2', ], @@ -670,7 +670,7 @@ 'run_all_unittests.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../app/app.gyp:app_base', # Needed for the following #include chain: |