Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: printing/printing.gyp

Issue 4137013: Revert 64454 - Revert 64441 - Mac cloud print proxy work.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing.gyp
===================================================================
--- printing/printing.gyp (revision 64476)
+++ printing/printing.gyp (working copy)
@@ -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',
+ ],
+ },
+ }],
+ ],
}],
],
},
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698