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

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

Issue 10692060: Add iOS support to ssl.gyp and zlib.gyp (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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 | « net/third_party/nss/ssl.gyp ('k') | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 != "ios" 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
11 # zlib brings up an incompatibility that breaks rendering. 11 # zlib brings up an incompatibility that breaks rendering.
12 'use_system_zlib%': 1, 12 'use_system_zlib%': 1,
13 }, { # os_posix != 1 or OS == "mac" or OS == "openbsd" 13 }, { # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "openbsd"
14 'use_system_zlib%': 0, 14 'use_system_zlib%': 0,
15 }], 15 }],
16 ], 16 ],
17 }, 17 },
18 'targets': [ 18 'targets': [
19 { 19 {
20 'target_name': 'zlib', 20 'target_name': 'zlib',
21 'type': 'static_library', 21 'type': 'static_library',
22 'conditions': [ 22 'conditions': [
23 ['use_system_zlib==0', { 23 ['use_system_zlib==0', {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ['OS=="android"', { 93 ['OS=="android"', {
94 'toolsets': ['target', 'host'], 94 'toolsets': ['target', 'host'],
95 }], 95 }],
96 ], 96 ],
97 'link_settings': { 97 'link_settings': {
98 'libraries': [ 98 'libraries': [
99 '-lz', 99 '-lz',
100 ], 100 ],
101 }, 101 },
102 }], 102 }],
103 ['OS=="mac" or os_bsd==1 or OS=="android"', { 103 ['OS=="mac" or OS=="ios" or os_bsd==1 or OS=="android"', {
104 # Mac, Android and the BSDs don't have fopen64, ftello64, or 104 # Mac, Android and the BSDs don't have fopen64, ftello64, or
105 # fseeko64. We use fopen, ftell, and fseek instead on these 105 # fseeko64. We use fopen, ftell, and fseek instead on these
106 # systems. 106 # systems.
107 'defines': [ 107 'defines': [
108 'USE_FILE32API' 108 'USE_FILE32API'
109 ], 109 ],
110 }], 110 }],
111 ['clang==1', { 111 ['clang==1', {
112 'xcode_settings': { 112 'xcode_settings': {
113 'WARNING_CFLAGS': [ 113 'WARNING_CFLAGS': [
114 # zlib uses `if ((a == b))` for some reason. 114 # zlib uses `if ((a == b))` for some reason.
115 '-Wno-parentheses-equality', 115 '-Wno-parentheses-equality',
116 ], 116 ],
117 }, 117 },
118 'cflags': [ 118 'cflags': [
119 '-Wno-parentheses-equality', 119 '-Wno-parentheses-equality',
120 ], 120 ],
121 }], 121 }],
122 ], 122 ],
123 } 123 }
124 ], 124 ],
125 } 125 }
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698