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

Unified Diff: third_party/zlib/BUILD.gn

Issue 708133002: win: build fixes (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: . Created 6 years, 1 month 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 | « third_party/libxml/BUILD.gn ('k') | ui/gfx/platform_font_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/BUILD.gn
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 18cf816397c05839f3f2d76f981fa95e0ee42a36..923e8ebc174ed8e9925566cedf9fffb22b6620ea 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -7,12 +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) {
+ cflags = [ "/wd4324" ]
+ }
}
static_library("zlib") {
@@ -52,7 +55,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" ]
}
« no previous file with comments | « third_party/libxml/BUILD.gn ('k') | ui/gfx/platform_font_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698