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

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

Issue 766573003: gn format //build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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 | « build/secondary/third_party/leveldatabase/BUILD.gn ('k') | build/secondary/third_party/libsrtp/BUILD.gn » ('j') | 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 4dbca978ab65019caaeca9c109f03255bffd45cd..82472e78c1d1571f30d6a36f56f6ed704b573842 100644
--- a/build/secondary/third_party/libjpeg_turbo/BUILD.gn
+++ b/build/secondary/third_party/libjpeg_turbo/BUILD.gn
@@ -10,106 +10,92 @@ if (cpu_arch == "arm") {
}
if (cpu_arch == "x86" || cpu_arch == "x64") {
+ import("//third_party/yasm/yasm_assemble.gni")
-import("//third_party/yasm/yasm_assemble.gni")
+ yasm_assemble("simd_asm") {
+ defines = []
-yasm_assemble("simd_asm") {
- defines = []
-
- if (cpu_arch == "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/jsimdcpu.asm",
- ]
- defines += [
- "__x86__",
- ]
- } else if (cpu_arch == "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",
- ]
- defines += [
- "__x86_64__",
- ]
- }
-
- if (is_win) {
- defines += [
- "MSVC",
- ]
- include_dirs = [ "win" ]
if (cpu_arch == "x86") {
- defines += [
- "WIN32",
+ 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/jsimdcpu.asm",
]
- } else {
- defines += [
- "WIN64",
+ defines += [ "__x86__" ]
+ } else if (cpu_arch == "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",
]
+ defines += [ "__x86_64__" ]
}
- } else if (is_mac) {
- defines += [
- "MACHO",
- ]
- include_dirs = [ "mac" ]
- } else if (is_linux) {
- defines += [
- "ELF",
- ]
- include_dirs = [ "linux" ]
- }
-}
+ if (is_win) {
+ defines += [ "MSVC" ]
+ include_dirs = [ "win" ]
+ if (cpu_arch == "x86") {
+ defines += [ "WIN32" ]
+ } else {
+ defines += [ "WIN64" ]
+ }
+ } else if (is_mac) {
+ defines += [ "MACHO" ]
+ include_dirs = [ "mac" ]
+ } else if (is_linux) {
+ defines += [ "ELF" ]
+ include_dirs = [ "linux" ]
+ }
+ }
}
source_set("simd") {
if (cpu_arch == "x86") {
- deps = [ ":simd_asm" ]
+ deps = [
+ ":simd_asm",
+ ]
sources = [
"simd/jsimd_i386.c",
]
@@ -117,7 +103,9 @@ source_set("simd") {
cflags = [ "/wd4245" ]
}
} else if (cpu_arch == "x64") {
- deps = [ ":simd_asm" ]
+ deps = [
+ ":simd_asm",
+ ]
sources = [
"simd/jsimd_x86_64.c",
]
@@ -128,7 +116,9 @@ source_set("simd") {
"simd/jsimd_arm_neon.S",
]
} else {
- sources = [ "jsimd_none.c" ]
+ sources = [
+ "jsimd_none.c",
+ ]
}
}
@@ -212,7 +202,9 @@ source_set("libjpeg") {
if (is_msan || is_linux) {
sources += [ "jsimd_none.c" ]
} else {
- deps = [ ":simd" ]
+ deps = [
+ ":simd",
+ ]
}
# TODO(GYP): Compile the .asm files with YASM as GYP does.
« no previous file with comments | « build/secondary/third_party/leveldatabase/BUILD.gn ('k') | build/secondary/third_party/libsrtp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698