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

Side by Side Diff: third_party/libjpeg_turbo/libjpeg.gyp

Issue 7554002: Updates libjpeg-turbo to 1.1.90 (r677) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « third_party/libjpeg_turbo/jversion.h ('k') | third_party/libjpeg_turbo/rdbmp.c » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
8 'conditions': [ 8 'conditions': [
9 [ 'chromeos==1 or OS=="freebsd" or OS=="openbsd"', { 9 [ 'chromeos==1 or OS=="freebsd" or OS=="openbsd"', {
10 # Link to system .so since we already use it due to GTK. 10 # Link to system .so since we already use it due to GTK.
(...skipping 17 matching lines...) Expand all
28 { 28 {
29 'target_name': 'libjpeg', 29 'target_name': 'libjpeg',
30 'type': '<(library)', 30 'type': '<(library)',
31 'include_dirs': [ 31 'include_dirs': [
32 '.', 32 '.',
33 ], 33 ],
34 'defines': [ 34 'defines': [
35 'WITH_SIMD', 'MOTION_JPEG_SUPPORTED', 35 'WITH_SIMD', 'MOTION_JPEG_SUPPORTED',
36 ], 36 ],
37 'sources': [ 37 'sources': [
38 'jconfig.h', 38 'jaricom.c',
39 'jpeglib.h',
40 'jpeglibmangler.h',
41 'jcapimin.c', 39 'jcapimin.c',
42 'jcapistd.c', 40 'jcapistd.c',
41 'jcarith.c',
43 'jccoefct.c', 42 'jccoefct.c',
44 'jccolor.c', 43 'jccolor.c',
45 'jcdctmgr.c', 44 'jcdctmgr.c',
46 'jchuff.c', 45 'jchuff.c',
47 'jchuff.h', 46 'jchuff.h',
48 'jcinit.c', 47 'jcinit.c',
49 'jcmainct.c', 48 'jcmainct.c',
50 'jcmarker.c', 49 'jcmarker.c',
51 'jcmaster.c', 50 'jcmaster.c',
52 'jcomapi.c', 51 'jcomapi.c',
52 'jconfig.h',
53 'jcparam.c', 53 'jcparam.c',
54 'jcphuff.c', 54 'jcphuff.c',
55 'jcprepct.c', 55 'jcprepct.c',
56 'jcsample.c', 56 'jcsample.c',
57 'jdapimin.c', 57 'jdapimin.c',
58 'jdapistd.c', 58 'jdapistd.c',
59 'jdarith.c',
59 'jdatadst.c', 60 'jdatadst.c',
60 'jdatasrc.c', 61 'jdatasrc.c',
61 'jdcoefct.c', 62 'jdcoefct.c',
62 'jdcolor.c', 63 'jdcolor.c',
63 'jdct.h', 64 'jdct.h',
64 'jddctmgr.c', 65 'jddctmgr.c',
65 'jdhuff.c', 66 'jdhuff.c',
66 'jdhuff.h', 67 'jdhuff.h',
67 'jdinput.c', 68 'jdinput.c',
68 'jdmainct.c', 69 'jdmainct.c',
(...skipping 11 matching lines...) Expand all
80 'jidctflt.c', 81 'jidctflt.c',
81 'jidctfst.c', 82 'jidctfst.c',
82 'jidctint.c', 83 'jidctint.c',
83 'jidctred.c', 84 'jidctred.c',
84 'jinclude.h', 85 'jinclude.h',
85 'jmemmgr.c', 86 'jmemmgr.c',
86 'jmemnobs.c', 87 'jmemnobs.c',
87 'jmemsys.h', 88 'jmemsys.h',
88 'jmorecfg.h', 89 'jmorecfg.h',
89 'jpegint.h', 90 'jpegint.h',
91 'jpeglib.h',
92 'jpeglibmangler.h',
90 'jquant1.c', 93 'jquant1.c',
91 'jquant2.c', 94 'jquant2.c',
92 'jutils.c', 95 'jutils.c',
93 'jversion.h', 96 'jversion.h',
94 ], 97 ],
95 'direct_dependent_settings': { 98 'direct_dependent_settings': {
96 'include_dirs': [ 99 'include_dirs': [
97 '.', 100 '.',
98 ], 101 ],
99 }, 102 },
100 'msvs_disabled_warnings': [4018, 4101], 103 'msvs_disabled_warnings': [4018, 4101],
101 'conditions': [ 104 'conditions': [
102 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}], 105 [ 'OS!="win"', {'product_name': 'jpeg_turbo'}],
103 # Add target-specific source files. 106 # Add target-specific source files.
104 [ 'target_arch=="ia32"', { 107 [ 'target_arch=="ia32"', {
105 'sources': [ 108 'sources': [
106 'simd/jsimd_i386.c', 109 'simd/jsimd_i386.c',
107 'simd/jsimdcpu.asm',
108 'simd/jccolmmx.asm', 110 'simd/jccolmmx.asm',
111 'simd/jccolss2.asm',
112 'simd/jcgrammx.asm',
113 'simd/jcgrass2.asm',
114 'simd/jcqnt3dn.asm',
115 'simd/jcqntmmx.asm',
116 'simd/jcqnts2f.asm',
117 'simd/jcqnts2i.asm',
118 'simd/jcqntsse.asm',
119 'simd/jcsammmx.asm',
120 'simd/jcsamss2.asm',
109 'simd/jdcolmmx.asm', 121 'simd/jdcolmmx.asm',
110 'simd/jcsammmx.asm', 122 'simd/jdcolss2.asm',
123 'simd/jdmermmx.asm',
124 'simd/jdmerss2.asm',
111 'simd/jdsammmx.asm', 125 'simd/jdsammmx.asm',
112 'simd/jdmermmx.asm', 126 'simd/jdsamss2.asm',
113 'simd/jcqntmmx.asm', 127 'simd/jf3dnflt.asm',
114 'simd/jfmmxfst.asm', 128 'simd/jfmmxfst.asm',
115 'simd/jfmmxint.asm', 129 'simd/jfmmxint.asm',
116 'simd/jimmxred.asm',
117 'simd/jimmxint.asm',
118 'simd/jimmxfst.asm',
119 'simd/jcqnt3dn.asm',
120 'simd/jf3dnflt.asm',
121 'simd/ji3dnflt.asm',
122 'simd/jcqntsse.asm',
123 'simd/jfsseflt.asm',
124 'simd/jisseflt.asm',
125 'simd/jccolss2.asm',
126 'simd/jdcolss2.asm',
127 'simd/jcsamss2.asm',
128 'simd/jdsamss2.asm',
129 'simd/jdmerss2.asm',
130 'simd/jcqnts2i.asm',
131 'simd/jfss2fst.asm', 130 'simd/jfss2fst.asm',
132 'simd/jfss2int.asm', 131 'simd/jfss2int.asm',
132 'simd/jfsseflt.asm',
133 'simd/ji3dnflt.asm',
134 'simd/jimmxfst.asm',
135 'simd/jimmxint.asm',
136 'simd/jimmxred.asm',
137 'simd/jiss2flt.asm',
138 'simd/jiss2fst.asm',
139 'simd/jiss2int.asm',
133 'simd/jiss2red.asm', 140 'simd/jiss2red.asm',
134 'simd/jiss2int.asm', 141 'simd/jisseflt.asm',
135 'simd/jiss2fst.asm', 142 'simd/jsimdcpu.asm',
136 'simd/jcqnts2f.asm',
137 'simd/jiss2flt.asm',
138 ], 143 ],
139 }], 144 }],
140 [ 'target_arch=="x64"', { 145 [ 'target_arch=="x64"', {
141 'sources': [ 146 'sources': [
142 'simd/jsimd_x86_64.c', 147 'simd/jsimd_x86_64.c',
143 'simd/jfsseflt-64.asm',
144 'simd/jccolss2-64.asm', 148 'simd/jccolss2-64.asm',
149 'simd/jcgrass2-64.asm',
150 'simd/jcqnts2f-64.asm',
151 'simd/jcqnts2i-64.asm',
152 'simd/jcsamss2-64.asm',
145 'simd/jdcolss2-64.asm', 153 'simd/jdcolss2-64.asm',
146 'simd/jcsamss2-64.asm', 154 'simd/jdmerss2-64.asm',
147 'simd/jdsamss2-64.asm', 155 'simd/jdsamss2-64.asm',
148 'simd/jdmerss2-64.asm',
149 'simd/jcqnts2i-64.asm',
150 'simd/jfss2fst-64.asm', 156 'simd/jfss2fst-64.asm',
151 'simd/jfss2int-64.asm', 157 'simd/jfss2int-64.asm',
158 'simd/jfsseflt-64.asm',
159 'simd/jiss2flt-64.asm',
160 'simd/jiss2fst-64.asm',
161 'simd/jiss2int-64.asm',
152 'simd/jiss2red-64.asm', 162 'simd/jiss2red-64.asm',
153 'simd/jiss2int-64.asm', 163 ],
154 'simd/jiss2fst-64.asm', 164 }],
155 'simd/jcqnts2f-64.asm', 165 [ 'target_arch=="arm"', {
156 'simd/jiss2flt-64.asm', 166 'sources': [
167 'simd/jsimd_arm.c',
168 'simd/jsimd_arm_neon.S',
157 ], 169 ],
158 }], 170 }],
159 171
160 # Build rules for an asm file. 172 # Build rules for an asm file.
161 # On Windows, we use the precompiled yasm binary. On Linux, we build 173 # On Windows, we use the precompiled yasm binary. On Linux, we build
162 # our patched yasm and use it except when use_system_yasm is 1. On 174 # our patched yasm and use it except when use_system_yasm is 1. On
163 # Mac, we always build our patched yasm and use it because of 175 # Mac, we always build our patched yasm and use it because of
164 # <http://www.tortall.net/projects/yasm/ticket/236>. 176 # <http://www.tortall.net/projects/yasm/ticket/236>.
165 [ 'OS=="win"', { 177 [ 'OS=="win"', {
166 'variables': { 178 'variables': {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 ], 277 ],
266 }], 278 }],
267 ], 279 ],
268 } 280 }
269 281
270 # Local Variables: 282 # Local Variables:
271 # tab-width:2 283 # tab-width:2
272 # indent-tabs-mode:nil 284 # indent-tabs-mode:nil
273 # End: 285 # End:
274 # vim: set expandtab tabstop=2 shiftwidth=2: 286 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « third_party/libjpeg_turbo/jversion.h ('k') | third_party/libjpeg_turbo/rdbmp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698