From 6df3ebfbab4615970e363ad194ad279b5bdd1336 Mon Sep 17 00:00:00 2001 From: "scottbyer@google.com" Date: Fri, 29 Oct 2010 20:30:38 +0000 Subject: 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 --- printing/printing.gyp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'printing/printing.gyp') diff --git a/printing/printing.gyp b/printing/printing.gyp index ac87ab3..7acb6d7 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -112,12 +112,6 @@ ], }], ['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. @@ -128,6 +122,22 @@ '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