From 2d79de25f18d2b5463abaf7e4eabaf79e602bfcc Mon Sep 17 00:00:00 2001
From: "hclam@chromium.org"
<hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 10 Jun 2010 00:39:03 +0000
Subject: [PATCH] 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
---
remoting/chromoting.gyp | 51 ++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/remoting/chromoting.gyp b/remoting/chromoting.gyp
index 22dd2bf726f6c..689ebd925030d 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': [
@@ -236,29 +263,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)',
@@ -374,7 +378,6 @@
}],
], # end of 'conditions'
}, # end of target 'chromoting_unittests'
-
], # end of targets
}
--
GitLab