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

Unified Diff: build/secondary/third_party/libjpeg_turbo/BUILD.gn

Issue 1935113002: Roll libjpeg-turbo to 1.4.90 and update gn file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable compiler warning on Win64 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/libjpeg_turbo/BUILD.gn
diff --git a/build/secondary/third_party/libjpeg_turbo/BUILD.gn b/build/secondary/third_party/libjpeg_turbo/BUILD.gn
index 847c94a9300378ace3fc53c06bb60517a33c8fc4..39a44e52540d1a9941b094cf90054ea33f7c5733 100644
--- a/build/secondary/third_party/libjpeg_turbo/BUILD.gn
+++ b/build/secondary/third_party/libjpeg_turbo/BUILD.gn
@@ -18,58 +18,60 @@ if (current_cpu == "x86" || current_cpu == "x64") {
if (current_cpu == "x86") {
sources = [
- "simd/jccolmmx.asm",
- "simd/jccolss2.asm",
- "simd/jcgrammx.asm",
- "simd/jcgrass2.asm",
- "simd/jcqnt3dn.asm",
- "simd/jcqntmmx.asm",
- "simd/jcqnts2f.asm",
- "simd/jcqnts2i.asm",
- "simd/jcqntsse.asm",
- "simd/jcsammmx.asm",
- "simd/jcsamss2.asm",
- "simd/jdcolmmx.asm",
- "simd/jdcolss2.asm",
- "simd/jdmermmx.asm",
- "simd/jdmerss2.asm",
- "simd/jdsammmx.asm",
- "simd/jdsamss2.asm",
- "simd/jf3dnflt.asm",
- "simd/jfmmxfst.asm",
- "simd/jfmmxint.asm",
- "simd/jfss2fst.asm",
- "simd/jfss2int.asm",
- "simd/jfsseflt.asm",
- "simd/ji3dnflt.asm",
- "simd/jimmxfst.asm",
- "simd/jimmxint.asm",
- "simd/jimmxred.asm",
- "simd/jiss2flt.asm",
- "simd/jiss2fst.asm",
- "simd/jiss2int.asm",
- "simd/jiss2red.asm",
- "simd/jisseflt.asm",
+ "simd/jccolor-mmx.asm",
+ "simd/jccolor-sse2.asm",
+ "simd/jcgray-mmx.asm",
+ "simd/jcgray-sse2.asm",
+ "simd/jchuff-sse2.asm",
+ "simd/jcsample-mmx.asm",
+ "simd/jcsample-sse2.asm",
+ "simd/jdcolor-mmx.asm",
+ "simd/jdcolor-sse2.asm",
+ "simd/jdmerge-mmx.asm",
+ "simd/jdmerge-sse2.asm",
+ "simd/jdsample-mmx.asm",
+ "simd/jdsample-sse2.asm",
+ "simd/jfdctflt-3dn.asm",
+ "simd/jfdctflt-sse.asm",
+ "simd/jfdctfst-mmx.asm",
+ "simd/jfdctfst-sse2.asm",
+ "simd/jfdctint-mmx.asm",
+ "simd/jfdctint-sse2.asm",
+ "simd/jidctflt-3dn.asm",
+ "simd/jidctflt-sse.asm",
+ "simd/jidctflt-sse2.asm",
+ "simd/jidctfst-mmx.asm",
+ "simd/jidctfst-sse2.asm",
+ "simd/jidctint-mmx.asm",
+ "simd/jidctint-sse2.asm",
+ "simd/jidctred-mmx.asm",
+ "simd/jidctred-sse2.asm",
+ "simd/jquant-3dn.asm",
+ "simd/jquant-mmx.asm",
+ "simd/jquant-sse.asm",
+ "simd/jquantf-sse2.asm",
+ "simd/jquanti-sse2.asm",
"simd/jsimdcpu.asm",
]
defines += [ "__x86__" ]
} else if (current_cpu == "x64") {
sources = [
- "simd/jccolss2-64.asm",
- "simd/jcgrass2-64.asm",
- "simd/jcqnts2f-64.asm",
- "simd/jcqnts2i-64.asm",
- "simd/jcsamss2-64.asm",
- "simd/jdcolss2-64.asm",
- "simd/jdmerss2-64.asm",
- "simd/jdsamss2-64.asm",
- "simd/jfss2fst-64.asm",
- "simd/jfss2int-64.asm",
- "simd/jfsseflt-64.asm",
- "simd/jiss2flt-64.asm",
- "simd/jiss2fst-64.asm",
- "simd/jiss2int-64.asm",
- "simd/jiss2red-64.asm",
+ "simd/jccolor-sse2-64.asm",
+ "simd/jcgray-sse2-64.asm",
+ "simd/jchuff-sse2-64.asm",
+ "simd/jcsample-sse2-64.asm",
+ "simd/jdcolor-sse2-64.asm",
+ "simd/jdmerge-sse2-64.asm",
+ "simd/jdsample-sse2-64.asm",
+ "simd/jfdctflt-sse-64.asm",
+ "simd/jfdctfst-sse2-64.asm",
+ "simd/jfdctint-sse2-64.asm",
+ "simd/jidctflt-sse2-64.asm",
+ "simd/jidctfst-sse2-64.asm",
+ "simd/jidctint-sse2-64.asm",
+ "simd/jidctred-sse2-64.asm",
+ "simd/jquantf-sse2-64.asm",
+ "simd/jquanti-sse2-64.asm",
]
defines += [ "__x86_64__" ]
}
@@ -100,9 +102,6 @@ source_set("simd") {
sources = [
"simd/jsimd_i386.c",
]
- if (is_win) {
- cflags = [ "/wd4245" ]
- }
} else if (current_cpu == "x64") {
deps = [
":simd_asm",
@@ -126,6 +125,10 @@ source_set("simd") {
"jsimd_none.c",
]
}
+
+ if (is_win) {
+ cflags = [ "/wd4245" ]
+ }
}
config("libjpeg_config") {
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698