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

Side by Side Diff: gyp/zlib.gyp

Issue 1234493002: Tweak GYP to also link with XCode 7. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Maybe this works? Created 5 years, 5 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 { 8 {
9 # Only used by win, down below. 9 # Only used by win, down below.
10 'target_name' : 'zlib_x86_simd', 10 'target_name' : 'zlib_x86_simd',
(...skipping 12 matching lines...) Expand all
23 }, 23 },
24 }], 24 }],
25 ], 25 ],
26 }, 26 },
27 { 27 {
28 'target_name': 'zlib', 28 'target_name': 'zlib',
29 'direct_dependent_settings': { 29 'direct_dependent_settings': {
30 'conditions': [ 30 'conditions': [
31 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }], 31 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }],
32 [ 'skia_os == "mac" or skia_os == "ios"', { 32 [ 'skia_os == "mac" or skia_os == "ios"', {
33 # XCode needs and explicit file path, not a logical name like -lz. 33 # XCode needs a full library name, not -lz.
34 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ] }, 34 'link_settings': { 'libraries': [ 'libz.dylib' ] },
35 }], 35 }],
36 [ 'skia_os not in ["mac", "ios", "win"]',{ 36 [ 'skia_os not in ["mac", "ios", "win"]',{
37 'link_settings': { 'libraries': [ '-lz' ] }, 37 'link_settings': { 'libraries': [ '-lz' ] },
38 }] 38 }]
39 ], 39 ],
40 }, 40 },
41 'conditions': [ 41 'conditions': [
42 [ 'skia_os != "win"', { 42 [ 'skia_os != "win"', {
43 'type': 'none', 43 'type': 'none',
44 }, { 44 }, {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 'dependencies': [ 86 'dependencies': [
87 'zlib_x86_simd', 87 'zlib_x86_simd',
88 ], 88 ],
89 'defines': [ 89 'defines': [
90 '_CRT_NONSTDC_NO_DEPRECATE', 90 '_CRT_NONSTDC_NO_DEPRECATE',
91 ], 91 ],
92 }], 92 }],
93 ], 93 ],
94 }], 94 }],
95 } 95 }
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