Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Side by Side Diff: libjpeg.gyp

Issue 1939823002: Update to libjpeg_turbo 1.4.90 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master
Patch Set: Response to comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« jdhuff.c ('K') | « jversion.h ('k') | libjpeg.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # This file is not used when use_system_libjpeg==1. Settings for building with 6 # This file is not used when use_system_libjpeg==1. Settings for building with
7 # the system libjpeg is in third_party/libjpeg/libjpeg.gyp. 7 # the system libjpeg is in third_party/libjpeg/libjpeg.gyp.
8 'variables': { 8 'variables': {
9 'use_system_yasm%': 0, 9 'use_system_yasm%': 0,
10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 # VS2010 does not correctly incrementally link obj files generated 95 # VS2010 does not correctly incrementally link obj files generated
96 # from asm files. This flag disables UseLibraryDependencyInputs to 96 # from asm files. This flag disables UseLibraryDependencyInputs to
97 # avoid this problem. 97 # avoid this problem.
98 'msvs_2010_disable_uldi_when_referenced': 1, 98 'msvs_2010_disable_uldi_when_referenced': 1,
99 'conditions': [ 99 'conditions': [
100 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}], 100 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}],
101 # Add target-specific source files. 101 # Add target-specific source files.
102 [ 'target_arch=="ia32"', { 102 [ 'target_arch=="ia32"', {
103 'sources': [ 103 'sources': [
104 'simd/jsimd_i386.c', 104 'simd/jsimd_i386.c',
105 'simd/jccolmmx.asm', 105 'simd/jccolor-mmx.asm',
106 'simd/jccolss2.asm', 106 'simd/jccolor-sse2.asm',
107 'simd/jcgrammx.asm', 107 'simd/jcgray-mmx.asm',
108 'simd/jcgrass2.asm', 108 'simd/jcgray-sse2.asm',
109 'simd/jcqnt3dn.asm', 109 'simd/jchuff-sse2.asm',
110 'simd/jcqntmmx.asm', 110 'simd/jcsample-mmx.asm',
111 'simd/jcqnts2f.asm', 111 'simd/jcsample-sse2.asm',
112 'simd/jcqnts2i.asm', 112 'simd/jdcolor-mmx.asm',
113 'simd/jcqntsse.asm', 113 'simd/jdcolor-sse2.asm',
114 'simd/jcsammmx.asm', 114 'simd/jdmerge-mmx.asm',
115 'simd/jcsamss2.asm', 115 'simd/jdmerge-sse2.asm',
116 'simd/jdcolmmx.asm', 116 'simd/jdsample-mmx.asm',
117 'simd/jdcolss2.asm', 117 'simd/jdsample-sse2.asm',
118 'simd/jdmermmx.asm', 118 'simd/jfdctflt-3dn.asm',
119 'simd/jdmerss2.asm', 119 'simd/jfdctflt-sse.asm',
120 'simd/jdsammmx.asm', 120 'simd/jfdctfst-mmx.asm',
121 'simd/jdsamss2.asm', 121 'simd/jfdctfst-sse2.asm',
122 'simd/jf3dnflt.asm', 122 'simd/jfdctint-mmx.asm',
123 'simd/jfmmxfst.asm', 123 'simd/jfdctint-sse2.asm',
124 'simd/jfmmxint.asm', 124 'simd/jidctflt-3dn.asm',
125 'simd/jfss2fst.asm', 125 'simd/jidctflt-sse2.asm',
126 'simd/jfss2int.asm', 126 'simd/jidctflt-sse.asm',
127 'simd/jfsseflt.asm', 127 'simd/jidctfst-mmx.asm',
128 'simd/ji3dnflt.asm', 128 'simd/jidctfst-sse2.asm',
129 'simd/jimmxfst.asm', 129 'simd/jidctint-mmx.asm',
130 'simd/jimmxint.asm', 130 'simd/jidctint-sse2.asm',
131 'simd/jimmxred.asm', 131 'simd/jidctred-mmx.asm',
132 'simd/jiss2flt.asm', 132 'simd/jidctred-sse2.asm',
133 'simd/jiss2fst.asm', 133 'simd/jquant-3dn.asm',
134 'simd/jiss2int.asm', 134 'simd/jquantf-sse2.asm',
135 'simd/jiss2red.asm', 135 'simd/jquanti-sse2.asm',
136 'simd/jisseflt.asm', 136 'simd/jquant-mmx.asm',
137 'simd/jquant-sse.asm',
137 'simd/jsimdcpu.asm', 138 'simd/jsimdcpu.asm',
138 ], 139 ],
139 }], 140 }],
140 [ 'target_arch=="x64" and msan!=1', { 141 [ 'target_arch=="x64" and msan!=1', {
141 'sources': [ 142 'sources': [
142 'simd/jsimd_x86_64.c', 143 'simd/jsimd_x86_64.c',
143 'simd/jccolss2-64.asm', 144 'simd/jccolor-sse2-64.asm',
144 'simd/jcgrass2-64.asm', 145 'simd/jcgray-sse2-64.asm',
145 'simd/jcqnts2f-64.asm', 146 'simd/jchuff-sse2-64.asm',
146 'simd/jcqnts2i-64.asm', 147 'simd/jcsample-sse2-64.asm',
147 'simd/jcsamss2-64.asm', 148 'simd/jdcolor-sse2-64.asm',
148 'simd/jdcolss2-64.asm', 149 'simd/jdmerge-sse2-64.asm',
149 'simd/jdmerss2-64.asm', 150 'simd/jdsample-sse2-64.asm',
150 'simd/jdsamss2-64.asm', 151 'simd/jfdctflt-sse-64.asm',
151 'simd/jfss2fst-64.asm', 152 'simd/jfdctfst-sse2-64.asm',
152 'simd/jfss2int-64.asm', 153 'simd/jfdctint-sse2-64.asm',
153 'simd/jfsseflt-64.asm', 154 'simd/jidctflt-sse2-64.asm',
154 'simd/jiss2flt-64.asm', 155 'simd/jidctfst-sse2-64.asm',
155 'simd/jiss2fst-64.asm', 156 'simd/jidctint-sse2-64.asm',
156 'simd/jiss2int-64.asm', 157 'simd/jidctred-sse2-64.asm',
157 'simd/jiss2red-64.asm', 158 'simd/jquantf-sse2-64.asm',
159 'simd/jquanti-sse2-64.asm',
158 ], 160 ],
159 }], 161 }],
160 # MemorySanitizer doesn't support assembly code, so keep it disabled in 162 # MemorySanitizer doesn't support assembly code, so keep it disabled in
161 # MSan builds for now. 163 # MSan builds for now.
162 [ 'msan==1', { 164 [ 'msan==1', {
163 'sources': [ 165 'sources': [
164 'jsimd_none.c', 166 'jsimd_none.c',
165 ], 167 ],
166 }], 168 }],
167 # The ARM SIMD implementation can be used for devices that support 169 # The ARM SIMD implementation can be used for devices that support
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 [ 'OS=="win"', { 203 [ 'OS=="win"', {
202 'variables': { 204 'variables': {
203 'yasm_path': '../yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)', 205 'yasm_path': '../yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)',
204 'conditions': [ 206 'conditions': [
205 [ 'target_arch=="ia32"', { 207 [ 'target_arch=="ia32"', {
206 'yasm_format': '-fwin32', 208 'yasm_format': '-fwin32',
207 'yasm_flags': [ 209 'yasm_flags': [
208 '-D__x86__', 210 '-D__x86__',
209 '-DWIN32', 211 '-DWIN32',
210 '-DMSVC', 212 '-DMSVC',
211 '-Iwin/'
212 ], 213 ],
213 }, { 214 }, {
214 'yasm_format': '-fwin64', 215 'yasm_format': '-fwin64',
215 'yasm_flags': [ 216 'yasm_flags': [
216 '-D__x86_64__', 217 '-D__x86_64__',
217 '-DWIN64', 218 '-DWIN64',
218 '-DMSVC', 219 '-DMSVC',
219 '-Iwin/'
220 ], 220 ],
221 }], 221 }],
222 ], 222 ],
223 }, 223 },
224 }], 224 }],
225 [ 'OS=="mac" or OS=="ios"', { 225 [ 'OS=="mac" or OS=="ios"', {
226 'dependencies': [ 226 'dependencies': [
227 '../yasm/yasm.gyp:yasm#host', 227 '../yasm/yasm.gyp:yasm#host',
228 ], 228 ],
229 'variables': { 229 'variables': {
230 'yasm_path': '<(PRODUCT_DIR)/yasm', 230 'yasm_path': '<(PRODUCT_DIR)/yasm',
231 'conditions': [ 231 'conditions': [
232 [ 'target_arch=="ia32"', { 232 [ 'target_arch=="ia32"', {
233 'yasm_format': '-fmacho', 233 'yasm_format': '-fmacho',
234 'yasm_flags': [ 234 'yasm_flags': [
235 '-D__x86__', 235 '-D__x86__',
236 '-DMACHO', 236 '-DMACHO',
237 '-Imac/'
238 ], 237 ],
239 }, { 238 }, {
240 'yasm_format': '-fmacho64', 239 'yasm_format': '-fmacho64',
241 'yasm_flags': [ 240 'yasm_flags': [
242 '-D__x86_64__', 241 '-D__x86_64__',
243 '-DMACHO', 242 '-DMACHO',
244 '-Imac/'
245 ], 243 ],
246 }], 244 }],
247 ], 245 ],
248 }, 246 },
249 }], 247 }],
250 [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia3 2" or target_arch=="x64"))', { 248 [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia3 2" or target_arch=="x64"))', {
251 'conditions': [ 249 'conditions': [
252 [ 'use_system_yasm==0', { 250 [ 'use_system_yasm==0', {
253 'dependencies': [ 251 'dependencies': [
254 '../yasm/yasm.gyp:yasm#host', 252 '../yasm/yasm.gyp:yasm#host',
255 ], 253 ],
256 }], 254 }],
257 ], 255 ],
258 'variables': { 256 'variables': {
259 'conditions': [ 257 'conditions': [
260 [ 'use_system_yasm==1', { 258 [ 'use_system_yasm==1', {
261 'yasm_path': '<!(which yasm)', 259 'yasm_path': '<!(which yasm)',
262 }, { 260 }, {
263 'yasm_path': '<(PRODUCT_DIR)/yasm', 261 'yasm_path': '<(PRODUCT_DIR)/yasm',
264 }], 262 }],
265 [ 'target_arch=="ia32"', { 263 [ 'target_arch=="ia32"', {
266 'yasm_format': '-felf', 264 'yasm_format': '-felf',
267 'yasm_flags': [ 265 'yasm_flags': [
268 '-D__x86__', 266 '-D__x86__',
269 '-DELF', 267 '-DELF',
270 '-Ilinux/'
271 ], 268 ],
272 }, { 269 }, {
273 'yasm_format': '-felf64', 270 'yasm_format': '-felf64',
274 'yasm_flags': [ 271 'yasm_flags': [
275 '-D__x86_64__', 272 '-D__x86_64__',
276 '-DELF', 273 '-DELF',
277 '-Ilinux/'
278 ], 274 ],
279 }], 275 }],
280 ], 276 ],
281 }, 277 },
282 }], 278 }],
283 ], 279 ],
284 'rules': [ 280 'rules': [
285 { 281 {
286 'rule_name': 'assemble', 282 'rule_name': 'assemble',
287 'extension': 'asm', 283 'extension': 'asm',
(...skipping 21 matching lines...) Expand all
309 ], 305 ],
310 }, 306 },
311 ], 307 ],
312 } 308 }
313 309
314 # Local Variables: 310 # Local Variables:
315 # tab-width:2 311 # tab-width:2
316 # indent-tabs-mode:nil 312 # indent-tabs-mode:nil
317 # End: 313 # End:
318 # vim: set expandtab tabstop=2 shiftwidth=2: 314 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« jdhuff.c ('K') | « jversion.h ('k') | libjpeg.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698