| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 '../third_party/externals/libjpeg/jversion.h', | 97 '../third_party/externals/libjpeg/jversion.h', |
| 98 ], | 98 ], |
| 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 'cflags': [ | 104 'cflags': [ |
| 105 '-w', # supresses warnings | 105 '-w', # supresses warnings |
| 106 ], | 106 ], |
| 107 | |
| 108 }, | 107 }, |
| 109 ], | 108 ], |
| 110 }, { | 109 }, { ## use_system_libjpeg != 0 |
| 111 'targets': [ | 110 'targets': [ |
| 112 { | 111 { |
| 113 'target_name': 'libjpeg', | 112 'target_name': 'libjpeg', |
| 114 'type': 'none', | 113 'type': 'none', |
| 115 'direct_dependent_settings': { | 114 'direct_dependent_settings': { |
| 116 'defines': [ | 115 'defines': [ |
| 117 'USE_SYSTEM_LIBJPEG', | 116 'USE_SYSTEM_LIBJPEG', |
| 118 ], | 117 ], |
| 119 }, | 118 }, |
| 120 'link_settings': { | 119 'link_settings': { |
| 121 'libraries': [ | 120 'libraries': [ |
| 122 '-ljpeg', | 121 '-ljpeg', |
| 123 ], | 122 ], |
| 124 }, | 123 }, |
| 125 } | 124 } |
| 126 ], | 125 ], |
| 127 }], | 126 }], |
| 128 ], | 127 ], |
| 129 }], | 128 }], |
| 130 ], | 129 ], |
| 131 } | 130 } |
| OLD | NEW |