From 71be19b75c1366de0387a78f4623df2f5bf21745 Mon Sep 17 00:00:00 2001
From: "scottbyer@chromium.org"
<scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 29 Oct 2010 16:47:58 +0000
Subject: Mac cloud print proxy work.
Turn on use_cups for the Mac, add in the required library, and tweak the code
to get it linking. There is still more work to do; this is just a gyp-oriented
change to get things started.
BUG=none
TEST=All targets still build on all platforms.
Review URL: http://codereview.chromium.org/4167006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64441 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/chrome.gyp | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
(limited to 'chrome/chrome.gyp')
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 961d908..b1e8ebb 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1165,12 +1165,6 @@
],
}],
['use_cups==1', {
- 'link_settings': {
- 'libraries': [
- '-lcups',
- '-lgcrypt',
- ],
- },
'defines': [
# CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
# of cloud print system, and allows to use custom implementaiton.
@@ -1179,6 +1173,22 @@
'sources': [
'service/cloud_print/print_system_cups.cc',
],
+ 'conditions': [
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/usr/lib/libcups.dylib',
+ ]
+ },
+ }, {
+ 'link_settings': {
+ 'libraries': [
+ '-lcups',
+ '-lgcrypt',
+ ],
+ },
+ }],
+ ],
}],
['remoting==1', {
'dependencies': [
--
cgit v1.1