Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'libpng', | 8 'target_name': 'libpng', |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 '../zlib/zlib.gyp:zlib', | 10 '../zlib/zlib.gyp:zlib', |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 'defines': [ | 62 'defines': [ |
| 63 'PNG_BUILD_DLL', | 63 'PNG_BUILD_DLL', |
| 64 'PNG_NO_MODULEDEF', | 64 'PNG_NO_MODULEDEF', |
| 65 ], | 65 ], |
| 66 'direct_dependent_settings': { | 66 'direct_dependent_settings': { |
| 67 'defines': [ | 67 'defines': [ |
| 68 'PNG_USE_DLL', | 68 'PNG_USE_DLL', |
| 69 ], | 69 ], |
| 70 }, | 70 }, |
| 71 }], | 71 }], |
| 72 ['OS=="win" and clang==1', { | |
| 73 'msvs_settings': { | |
| 74 'VCCLCompilerTool': { | |
| 75 'AdditionalOptions': [ | |
| 76 '-Wno-self-assign', # http://crbug.com/505306. | |
|
Nico
2015/06/29 23:51:02
Likewise – add a
'variables': {
'clang_warn
scottmg
2015/06/30 00:32:55
Done.
| |
| 77 ], | |
| 78 }, | |
| 79 }, | |
| 80 }], | |
| 72 ['OS=="android"', { | 81 ['OS=="android"', { |
| 73 'toolsets': ['target', 'host'], | 82 'toolsets': ['target', 'host'], |
| 74 'defines': [ | 83 'defines': [ |
| 75 'CHROME_PNG_READ_PACK_SUPPORT', # Required by freetype. | 84 'CHROME_PNG_READ_PACK_SUPPORT', # Required by freetype. |
| 76 ], | 85 ], |
| 77 'direct_dependent_settings': { | 86 'direct_dependent_settings': { |
| 78 'defines': [ | 87 'defines': [ |
| 79 'CHROME_PNG_READ_PACK_SUPPORT', | 88 'CHROME_PNG_READ_PACK_SUPPORT', |
| 80 ], | 89 ], |
| 81 }, | 90 }, |
| 82 }], | 91 }], |
| 83 ], | 92 ], |
| 84 }, | 93 }, |
| 85 ] | 94 ] |
| 86 } | 95 } |
| OLD | NEW |