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

Side by Side Diff: gyp/zlib.gyp

Issue 936033003: fix xcode build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 Google Inc. 1 # Copyright 2014 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [{ 7 'targets': [{
8 'target_name': 'zlib', 8 'target_name': 'zlib',
9 'type': 'none', 9 'type': 'none',
10 'link_settings': { 'libraries': [ '-lz' ] },
11 'direct_dependent_settings': { 10 'direct_dependent_settings': {
12 'conditions': [ 11 'conditions': [
13 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }] 12 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }],
13 [ 'skia_os == "mac" or skia_os == "ios"', {
14 # XCode needs and explicit file path, not a logical name like -lz.
15 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ] },
16 },{
17 'link_settings': { 'libraries': [ '-lz' ] },
18 }]
14 ], 19 ],
15 }, 20 },
16 }], 21 }],
17 } 22 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698