From 0dc2a814add97c39e5fcd99b31bfeae028fdead0 Mon Sep 17 00:00:00 2001 From: "scottbyer@google.com" Date: Fri, 29 Oct 2010 18:16:44 +0000 Subject: 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 --- printing/printing.gyp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'printing/printing.gyp') diff --git a/printing/printing.gyp b/printing/printing.gyp index 7acb6d7..ac87ab3 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -112,6 +112,12 @@ ], }], ['use_cups==1', { + 'link_settings': { + 'libraries': [ + '-lcups', + '-lgcrypt', + ], + }, 'defines': [ # PRINT_BACKEND_AVAILABLE disables the default dummy implementation # of the print backend and enables a custom implementation instead. @@ -122,22 +128,6 @@ 'backend/cups_helper.h', 'backend/print_backend_cups.cc', ], - 'conditions': [ - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/usr/lib/libcups.dylib', - ] - }, - }, { - 'link_settings': { - 'libraries': [ - '-lcups', - '-lgcrypt', - ], - }, - }], - ], }], ], }, -- cgit v1.1