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

Side by Side Diff: third_party/zlib/zlib.gyp

Issue 8806004: Update zlib to 1.2.5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « third_party/zlib/zlib.h ('k') | third_party/zlib/zutil.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { 8 [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', {
9 # Link to system .so since we already use it due to GTK. 9 # Link to system .so since we already use it due to GTK.
10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system 10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 '.', 64 '.',
65 ], 65 ],
66 }, 66 },
67 'conditions': [ 67 'conditions': [
68 ['OS!="win"', { 68 ['OS!="win"', {
69 'product_name': 'chrome_zlib', 69 'product_name': 'chrome_zlib',
70 'sources!': [ 70 'sources!': [
71 'contrib/minizip/iowin32.c' 71 'contrib/minizip/iowin32.c'
72 ], 72 ],
73 }], 73 }],
74 ['OS=="mac"', {
agl 2011/12/07 15:05:19 Needs a comment explaining what it does and why it
Hironori Bono 2011/12/08 07:16:47 Done. Thanks for reminding it. (I forgot adding it
75 'defines': [
76 'USE_FILE32API'
77 ],
78 }],
74 ], 79 ],
75 }, 80 },
76 ], 81 ],
77 }, { 82 }, {
78 'targets': [ 83 'targets': [
79 { 84 {
80 'target_name': 'zlib', 85 'target_name': 'zlib',
81 'type': 'static_library', 86 'type': 'static_library',
82 'direct_dependent_settings': { 87 'direct_dependent_settings': {
83 'defines': [ 88 'defines': [
(...skipping 19 matching lines...) Expand all
103 'link_settings': { 108 'link_settings': {
104 'libraries': [ 109 'libraries': [
105 '-lz', 110 '-lz',
106 ], 111 ],
107 }, 112 },
108 }, 113 },
109 ], 114 ],
110 }], 115 }],
111 ], 116 ],
112 } 117 }
OLDNEW
« no previous file with comments | « third_party/zlib/zlib.h ('k') | third_party/zlib/zutil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698