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

Side by Side Diff: third_party/zlib/BUILD.gn

Issue 742583003: Fix fallout from https://codereview.chromium.org/678423002/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/zlib/zlib.gyp » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 config("zlib_config") { 5 config("zlib_config") {
6 include_dirs = [ "." ] 6 include_dirs = [ "." ]
7 } 7 }
8 8
9 static_library("zlib_x86_simd") { 9 static_library("zlib_x86_simd") {
10 if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) { 10 if (!is_ios && (cpu_arch == "x86" || cpu_arch == "x64")) {
11 sources = [ "crc_folding.c", "fill_window_sse.c" ] 11 sources = [ "crc_folding.c", "fill_window_sse.c" ]
12 cflags = [ "-msse2", "-msse4.2", "-mpclmul" ] 12 if (!is_win || is_clang) {
13 cflags = [ "-msse4.2", "-mpclmul" ]
14 }
13 } else { 15 } else {
14 sources = [ "simd_stub.c"] 16 sources = [ "simd_stub.c"]
15 } 17 }
16 18
17 configs -= [ "//build/config/compiler:chromium_code" ] 19 configs -= [ "//build/config/compiler:chromium_code" ]
18 configs += [ "//build/config/compiler:no_chromium_code" ] 20 configs += [ "//build/config/compiler:no_chromium_code" ]
19 } 21 }
20 22
21 static_library("zlib") { 23 static_library("zlib") {
22 if (!is_win) { 24 if (!is_win) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 "google/zip_internal.cc", 111 "google/zip_internal.cc",
110 "google/zip_internal.h", 112 "google/zip_internal.h",
111 "google/zip_reader.cc", 113 "google/zip_reader.cc",
112 "google/zip_reader.h", 114 "google/zip_reader.h",
113 ] 115 ]
114 deps = [ 116 deps = [
115 ":minizip", 117 ":minizip",
116 "//base", 118 "//base",
117 ] 119 ]
118 } 120 }
OLDNEW
« no previous file with comments | « no previous file | third_party/zlib/zlib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698