| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 '../third_party/externals/libjpeg/jpeglibmangler.h', | 93 '../third_party/externals/libjpeg/jpeglibmangler.h', |
| 94 '../third_party/externals/libjpeg/jquant1.c', | 94 '../third_party/externals/libjpeg/jquant1.c', |
| 95 '../third_party/externals/libjpeg/jquant2.c', | 95 '../third_party/externals/libjpeg/jquant2.c', |
| 96 '../third_party/externals/libjpeg/jutils.c', | 96 '../third_party/externals/libjpeg/jutils.c', |
| 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 'defines': [ |
| 104 # Mangle the names so they do not conflict with libjpeg-turbo |
| 105 'NEED_SHORT_EXTERNAL_NAMES', |
| 106 ], |
| 103 }, | 107 }, |
| 104 'cflags': [ | 108 'cflags': [ |
| 105 '-w', # supresses warnings | 109 '-w', # supresses warnings |
| 110 # Mangle the names so they do not conflict with libjpeg-turbo |
| 111 '-DNEED_SHORT_EXTERNAL_NAMES', |
| 106 ], | 112 ], |
| 107 }, | 113 }, |
| 108 ], | 114 ], |
| 109 }, { ## use_system_libjpeg != 0 | 115 }, { ## use_system_libjpeg != 0 |
| 110 'targets': [ | 116 'targets': [ |
| 111 { | 117 { |
| 112 'target_name': 'libjpeg', | 118 'target_name': 'libjpeg', |
| 113 'type': 'none', | 119 'type': 'none', |
| 114 'direct_dependent_settings': { | 120 'direct_dependent_settings': { |
| 115 'defines': [ | 121 'defines': [ |
| 116 'USE_SYSTEM_LIBJPEG', | 122 'USE_SYSTEM_LIBJPEG', |
| 117 ], | 123 ], |
| 118 }, | 124 }, |
| 119 'link_settings': { | 125 'link_settings': { |
| 120 'libraries': [ | 126 'libraries': [ |
| 121 '-ljpeg', | 127 '-ljpeg', |
| 122 ], | 128 ], |
| 123 }, | 129 }, |
| 124 } | 130 } |
| 125 ], | 131 ], |
| 126 }], | 132 }], |
| 127 ], | 133 ], |
| 128 }], | 134 }], |
| 129 ], | 135 ], |
| 130 } | 136 } |
| OLD | NEW |