| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 '.', | 44 '.', |
| 45 ], | 45 ], |
| 46 }, | 46 }, |
| 47 'export_dependent_settings': [ | 47 'export_dependent_settings': [ |
| 48 '../zlib/zlib.gyp:zlib', | 48 '../zlib/zlib.gyp:zlib', |
| 49 ], | 49 ], |
| 50 'msvs_disabled_warnings': [ | 50 'msvs_disabled_warnings': [ |
| 51 4267, # TODO(jschuh): http://crbug.com/167187 | 51 4267, # TODO(jschuh): http://crbug.com/167187 |
| 52 4146, # Unary minus applied to unsigned type. | 52 4146, # Unary minus applied to unsigned type. |
| 53 ], | 53 ], |
| 54 # This is a fix for png encoding performance regressions (crbug.com/619850
). |
| 55 'msvs_settings': { |
| 56 'VCCLCompilerTool': { |
| 57 'AdditionalOptions': [ |
| 58 '/O2', |
| 59 ], |
| 60 }, |
| 61 }, |
| 54 'conditions': [ | 62 'conditions': [ |
| 55 # Disable ARM optimizations on IOS. Can't find a way to get gyp to even
try | 63 # Disable ARM optimizations on IOS. Can't find a way to get gyp to even
try |
| 56 # to compile the optimization files. This works fine on GN. | 64 # to compile the optimization files. This works fine on GN. |
| 57 [ 'OS=="ios"', { | 65 [ 'OS=="ios"', { |
| 58 'defines': [ | 66 'defines': [ |
| 59 'PNG_ARM_NEON_OPT=0', | 67 'PNG_ARM_NEON_OPT=0', |
| 60 ], | 68 ], |
| 61 }], | 69 }], |
| 62 | 70 |
| 63 # SSE optimizations | 71 # SSE optimizations |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 ], | 110 ], |
| 103 }, | 111 }, |
| 104 }], | 112 }], |
| 105 ['OS=="android"', { | 113 ['OS=="android"', { |
| 106 'toolsets': ['target', 'host'], | 114 'toolsets': ['target', 'host'], |
| 107 }], | 115 }], |
| 108 ], | 116 ], |
| 109 }, | 117 }, |
| 110 ] | 118 ] |
| 111 } | 119 } |
| OLD | NEW |