diff options
| author | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
|---|---|---|
| committer | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
| commit | 6df3ebfbab4615970e363ad194ad279b5bdd1336 (patch) | |
| tree | 7ff1f4cec7b7f3a00323db2be47f088d1f334e45 /chrome | |
| parent | 366a883e1ad04b5cf8a7088644560ab86f5f1f0d (diff) | |
| download | chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.zip chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.gz chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.bz2 | |
Revert 64454 - Revert 64441 - 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
TBR=scottbyer@chromium.org
Review URL: http://codereview.chromium.org/4136011
TBR=scottbyer@google.com
Review URL: http://codereview.chromium.org/4137013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 22 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_cups.cc | 1 |
2 files changed, 16 insertions, 7 deletions
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': [ diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 99e3d1d..12548af 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -7,7 +7,6 @@ #include <cups/cups.h> #include <dlfcn.h> #include <errno.h> -#include <gcrypt.h> #include <pthread.h> #include <list> |