summaryrefslogtreecommitdiffstats
path: root/third_party/zlib/BUILD.gn
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-07 18:59:57 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-08 03:00:11 +0000
commit43760591658239084cf4b92ec4dd4decbb9c5fe6 (patch)
treead7de37cacaa7d319b8158d5ee15dc152471f410 /third_party/zlib/BUILD.gn
parent22e04357bc9bcfe37aa8de313fe7081944daadda (diff)
downloadchromium_src-43760591658239084cf4b92ec4dd4decbb9c5fe6.zip
chromium_src-43760591658239084cf4b92ec4dd4decbb9c5fe6.tar.gz
chromium_src-43760591658239084cf4b92ec4dd4decbb9c5fe6.tar.bz2
Make *some* version of the Win GN build work.
R=scottmg@chromium.org, brettw@chromium.org BUG=354261 Review URL: https://codereview.chromium.org/709593004 Cr-Commit-Position: refs/heads/master@{#303366}
Diffstat (limited to 'third_party/zlib/BUILD.gn')
-rw-r--r--third_party/zlib/BUILD.gn8
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 18cf816..5dbec0f 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -7,11 +7,15 @@ config("zlib_config") {
}
static_library("zlib_x86_simd") {
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) {
sources = [ "crc_folding.c", "fill_window_sse.c" ]
cflags = [ "-msse2", "-msse4.2", "-mpclmul" ]
} else {
sources = [ "simd_stub.c"]
+ if (is_win) {
+ # TODO(GYP): crbug.com/431462 disable warning about structure padding.
+ cflags = [ "/wd4324" ]
+ }
}
}
@@ -52,7 +56,7 @@ static_library("zlib") {
"zutil.h",
]
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) {
sources += [ "x86.c" ]
}