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

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

Issue 11778076: disable c4267 in libpng for building on win x64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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) 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 != "android"', { 8 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
9 # Maybe link to system .so once the security concerns are thought 9 # Maybe link to system .so once the security concerns are thought
10 # through, since we already use it due to GTK. 10 # through, since we already use it due to GTK.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 '.', 53 '.',
54 ], 54 ],
55 'defines': [ 55 'defines': [
56 'CHROME_PNG_WRITE_SUPPORT', 56 'CHROME_PNG_WRITE_SUPPORT',
57 'PNG_USER_CONFIG', 57 'PNG_USER_CONFIG',
58 ], 58 ],
59 }, 59 },
60 'export_dependent_settings': [ 60 'export_dependent_settings': [
61 '../zlib/zlib.gyp:zlib', 61 '../zlib/zlib.gyp:zlib',
62 ], 62 ],
63 # TODO(jschuh): http://crbug.com/167187
64 'msvs_disabled_warnings': [ 4267 ],
63 'conditions': [ 65 'conditions': [
64 ['OS!="win"', {'product_name': 'png'}], 66 ['OS!="win"', {'product_name': 'png'}],
65 ['OS=="win"', { 67 ['OS=="win"', {
66 'type': '<(component)', 68 'type': '<(component)',
67 }, { 69 }, {
68 # Chromium libpng does not support building as a shared_library 70 # Chromium libpng does not support building as a shared_library
69 # on non-Windows platforms. 71 # on non-Windows platforms.
70 'type': 'static_library', 72 'type': 'static_library',
71 }], 73 }],
72 ['OS=="win" and component=="shared_library"', { 74 ['OS=="win" and component=="shared_library"', {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 ], 128 ],
127 }, 129 },
128 'includes': [ 130 'includes': [
129 '../../build/shim_headers.gypi', 131 '../../build/shim_headers.gypi',
130 ], 132 ],
131 }, 133 },
132 ], 134 ],
133 }], 135 }],
134 ], 136 ],
135 } 137 }
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