| 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 29 matching lines...) Expand all Loading... |
| 40 'pngwutil.c', | 40 'pngwutil.c', |
| 41 ], | 41 ], |
| 42 'direct_dependent_settings': { | 42 'direct_dependent_settings': { |
| 43 'include_dirs': [ | 43 'include_dirs': [ |
| 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 # TODO(jschuh): http://crbug.com/167187 | 50 'msvs_disabled_warnings': [ |
| 51 'msvs_disabled_warnings': [ 4267 ], | 51 4267, # TODO(jschuh): http://crbug.com/167187 |
| 52 4146, # Unary minus applied to unsigned type. |
| 53 ], |
| 52 'conditions': [ | 54 'conditions': [ |
| 53 # Disable ARM optimizations on IOS. Can't find a way to get gyp to even
try | 55 # Disable ARM optimizations on IOS. Can't find a way to get gyp to even
try |
| 54 # to compile the optimization files. This works fine on GN. | 56 # to compile the optimization files. This works fine on GN. |
| 55 [ 'OS=="ios"', { | 57 [ 'OS=="ios"', { |
| 56 'defines': [ | 58 'defines': [ |
| 57 'PNG_ARM_NEON_OPT=0', | 59 'PNG_ARM_NEON_OPT=0', |
| 58 ], | 60 ], |
| 59 }], | 61 }], |
| 60 | 62 |
| 61 # SSE optimizations | 63 # SSE optimizations |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 ], | 102 ], |
| 101 }, | 103 }, |
| 102 }], | 104 }], |
| 103 ['OS=="android"', { | 105 ['OS=="android"', { |
| 104 'toolsets': ['target', 'host'], | 106 'toolsets': ['target', 'host'], |
| 105 }], | 107 }], |
| 106 ], | 108 ], |
| 107 }, | 109 }, |
| 108 ] | 110 ] |
| 109 } | 111 } |
| OLD | NEW |