| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified | 5 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified |
| 6 # such that all source paths point into that directory. | 6 # such that all source paths point into that directory. |
| 7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp | 7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp |
| 8 # from Chrome's libjpeg port, rather than making our own copy') for a better | 8 # from Chrome's libjpeg port, rather than making our own copy') for a better |
| 9 # long-term solution. | 9 # long-term solution. |
| 10 | 10 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 'direct_dependent_settings': { | 99 'direct_dependent_settings': { |
| 100 'include_dirs': [ | 100 'include_dirs': [ |
| 101 '../third_party/externals/libjpeg', | 101 '../third_party/externals/libjpeg', |
| 102 ], | 102 ], |
| 103 }, | 103 }, |
| 104 'conditions': [ | 104 'conditions': [ |
| 105 [ 'skia_os != "win"', { | 105 [ 'skia_os != "win"', { |
| 106 'product_name': 'jpeg', | 106 'product_name': 'jpeg', |
| 107 'cflags': [ | 107 'cflags': [ |
| 108 '-Wno-main', # supresses warnings about naming things "main" | 108 '-Wno-main', # supresses warnings about naming things "main" |
| 109 '-Wno-attributes', # supresses warnings |
| 109 ], | 110 ], |
| 110 }], | 111 }], |
| 111 ], | 112 ], |
| 112 }, | 113 }, |
| 113 ], | 114 ], |
| 114 }, { | 115 }, { ## use_system_libjpeg != 0 |
| 115 'targets': [ | 116 'targets': [ |
| 116 { | 117 { |
| 117 'target_name': 'libjpeg', | 118 'target_name': 'libjpeg', |
| 118 'type': 'none', | 119 'type': 'none', |
| 119 'direct_dependent_settings': { | 120 'direct_dependent_settings': { |
| 120 'defines': [ | 121 'defines': [ |
| 121 'USE_SYSTEM_LIBJPEG', | 122 'USE_SYSTEM_LIBJPEG', |
| 122 ], | 123 ], |
| 123 }, | 124 }, |
| 124 'link_settings': { | 125 'link_settings': { |
| 125 'libraries': [ | 126 'libraries': [ |
| 126 '-ljpeg', | 127 '-ljpeg', |
| 127 ], | 128 ], |
| 128 }, | 129 }, |
| 129 } | 130 } |
| 130 ], | 131 ], |
| 131 }], | 132 }], |
| 132 ], | 133 ], |
| 133 }], | 134 }], |
| 134 ], | 135 ], |
| 135 } | 136 } |
| OLD | NEW |