diff options
| author | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 18:16:44 +0000 |
|---|---|---|
| committer | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 18:16:44 +0000 |
| commit | 0dc2a814add97c39e5fcd99b31bfeae028fdead0 (patch) | |
| tree | 2e7c869798e2a6eb7a82c2e712259c166ec384ca /chrome | |
| parent | 0e92b5fa4d9837066b9c8ae6d36e9ec32174f3cf (diff) | |
| download | chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.zip chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.gz chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64454 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, 7 insertions, 16 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index b1e8ebb..961d908 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1165,6 +1165,12 @@ ], }], ['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. @@ -1173,22 +1179,6 @@ '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 12548af..99e3d1d 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -7,6 +7,7 @@ #include <cups/cups.h> #include <dlfcn.h> #include <errno.h> +#include <gcrypt.h> #include <pthread.h> #include <list> |