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

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

Issue 201074: Revert 25818 - Explicitly only use xmldummy_mac.cc on Mac systems, since libx... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 3 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 | Annotate | Revision Log
« 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 (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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=="linux" or OS=="freebsd"', {'os_include': 'linux'}], 8 ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}],
9 ['OS=="mac"', {'os_include': 'mac'}], 9 ['OS=="mac"', {'os_include': 'mac'}],
10 ['OS=="win"', {'os_include': 'win32'}], 10 ['OS=="win"', {'os_include': 'win32'}],
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 }], 182 }],
183 ], 183 ],
184 }], 184 }],
185 ], 185 ],
186 }, 186 },
187 { 187 {
188 'target_name': 'xmlcatalog', 188 'target_name': 'xmlcatalog',
189 'type': 'executable', 189 'type': 'executable',
190 'sources': [ 190 'sources': [
191 'xmlcatalog.c', 191 'xmlcatalog.c',
192 'xmldummy_mac.cc',
192 ], 193 ],
193 'include_dirs': [ 194 'include_dirs': [
194 '<(os_include)', 195 '<(os_include)',
195 ], 196 ],
196 'dependencies': [ 197 'dependencies': [
197 'libxml', 198 'libxml',
198 ], 199 ],
199 'conditions': [ 200 'conditions': [
200 ['OS=="linux"', { 201 ['OS=="linux"', {
201 'link_settings': { 202 'link_settings': {
202 'libraries': [ 203 'libraries': [
203 '-ldl', 204 '-ldl',
204 '-lm', 205 '-lm',
205 ], 206 ],
206 }, 207 },
207 }], 208 }],
208 ['OS=="mac"', {
209 'sources': [
210 'xmldummy_mac.cc',
211 ],
212 }],
213 ], 209 ],
214 }, 210 },
215 { 211 {
216 'target_name': 'xmllint', 212 'target_name': 'xmllint',
217 'type': 'executable', 213 'type': 'executable',
218 'sources': [ 214 'sources': [
219 'xmllint.c', 215 'xmllint.c',
216 'xmldummy_mac.cc',
220 ], 217 ],
221 'include_dirs': [ 218 'include_dirs': [
222 '<(os_include)', 219 '<(os_include)',
223 ], 220 ],
224 'dependencies': [ 221 'dependencies': [
225 'libxml', 222 'libxml',
226 '../icu/icu.gyp:icuuc', 223 '../icu/icu.gyp:icuuc',
227 ], 224 ],
228 'conditions': [ 225 'conditions': [
229 ['OS=="linux"', { 226 ['OS=="linux"', {
230 'link_settings': { 227 'link_settings': {
231 'libraries': [ 228 'libraries': [
232 '-ldl', 229 '-ldl',
233 '-lm', 230 '-lm',
234 ], 231 ],
235 }, 232 },
236 }], 233 }],
237 ['OS=="mac"', {
238 'sources': [
239 'xmldummy_mac.cc',
240 ],
241 }],
242 ], 234 ],
243 }, 235 },
244 ], 236 ],
245 } 237 }
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