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

Unified Diff: remoting/remoting.gyp

Issue 7055003: Last gyp patch for cross-platform Unix support (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 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
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 1203522226a21a870ee1b1a5c6b4e4d29ddb1b5b..d151f260c438f597df60240573eeaa8b52c4457b 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': [
{
@@ -343,7 +343,7 @@
'host/user_authenticator_win.cc',
],
'conditions': [
- ['OS=="linux"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -571,7 +571,7 @@
'..',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ [ 'os_posix == 1 and OS != "mac"', {
'cflags': [
'-msse2',
],
@@ -666,7 +666,7 @@
'run_all_unittests.cc',
],
'conditions': [
- ['OS=="linux"', {
+ ['toolkit_uses_gtk == 1', {
'dependencies': [
'../app/app.gyp:app_base',
# Needed for the following #include chain:
« printing/printing.gyp ('K') | « printing/printing.gyp ('k') | sandbox/sandbox.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698