diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:39:03 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:39:03 +0000 |
commit | 2d79de25f18d2b5463abaf7e4eabaf79e602bfcc (patch) | |
tree | f9b07d5b2cae63c0d99213ab02c7299bfac771aa /remoting | |
parent | 0756b454ebf4d7988191d302fce0752ff29fb7fe (diff) | |
download | chromium_src-2d79de25f18d2b5463abaf7e4eabaf79e602bfcc.zip chromium_src-2d79de25f18d2b5463abaf7e4eabaf79e602bfcc.tar.gz chromium_src-2d79de25f18d2b5463abaf7e4eabaf79e602bfcc.tar.bz2 |
Fix chromoting build for windows
Build chromoting_x11_client only on posix systems.
Review URL: http://codereview.chromium.org/2766004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/chromoting.gyp | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/remoting/chromoting.gyp b/remoting/chromoting.gyp index 22dd2bf..689ebd9 100644 --- a/remoting/chromoting.gyp +++ b/remoting/chromoting.gyp @@ -91,6 +91,33 @@ ], # end of Client targets }], # end of OS conditions for Client targets + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="mac"', { + 'targets': [ + { + 'target_name': 'chromoting_x11_client', + 'type': 'executable', + 'dependencies': [ + 'chromoting_base', + 'chromoting_client', + 'chromoting_jingle_glue', + ], + 'link_settings': { + 'libraries': [ + '-ldl', + '-lX11', + '-lXrender', + '-lXext', + ], + }, + 'sources': [ + 'client/x11_client.cc', + 'client/x11_view.cc', + 'client/x11_view.h', + ], + }, # end of target 'chromoting_x11_client' + ], + }], # end of OS conditions for x11 client + ], # end of 'conditions' 'targets': [ @@ -237,29 +264,6 @@ }, # end of target 'chromoting_simple_client' { - 'target_name': 'chromoting_x11_client', - 'type': 'executable', - 'dependencies': [ - 'chromoting_base', - 'chromoting_client', - 'chromoting_jingle_glue', - ], - 'link_settings': { - 'libraries': [ - '-ldl', - '-lX11', - '-lXrender', - '-lXext', - ], - }, - 'sources': [ - 'client/x11_client.cc', - 'client/x11_view.cc', - 'client/x11_view.h', - ], - }, # end of target 'chromoting_x11_client' - - { 'target_name': 'chromoting_jingle_glue', 'type': '<(library)', 'dependencies': [ @@ -374,7 +378,6 @@ }], ], # end of 'conditions' }, # end of target 'chromoting_unittests' - ], # end of targets } |