Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(757)

Unified Diff: remoting/chromoting.gyp

Issue 2766004: Fix chromoting build for windows (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/chromoting.gyp
diff --git a/remoting/chromoting.gyp b/remoting/chromoting.gyp
index 22dd2bf726f6c22f49ab3b6d4122ae97bc312be6..689ebd925030d82a1835f67bc1b9b414f6ed9451 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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698