| OLD | NEW |
| 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_win && (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 cflags = [ "-msse2", "-msse4.2", "-mpclmul" ] |
| 13 } else { | 13 } else { |
| 14 sources = [ "simd_stub.c"] | 14 sources = [ "simd_stub.c"] |
| 15 if (is_win) { | |
| 16 # TODO(GYP): crbug.com/431462 disable warning about structure padding. | |
| 17 cflags = [ "/wd4324" ] | |
| 18 } | |
| 19 } | 15 } |
| 16 |
| 17 configs -= [ "//build/config/compiler:chromium_code" ] |
| 18 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 20 } | 19 } |
| 21 | 20 |
| 22 static_library("zlib") { | 21 static_library("zlib") { |
| 23 if (!is_win) { | 22 if (!is_win) { |
| 24 # Don't stomp on "libzlib" on other platforms. | 23 # Don't stomp on "libzlib" on other platforms. |
| 25 output_name = "chrome_zlib" | 24 output_name = "chrome_zlib" |
| 26 } | 25 } |
| 27 | 26 |
| 28 sources = [ | 27 sources = [ |
| 29 "adler32.c", | 28 "adler32.c", |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 "google/zip_internal.cc", | 109 "google/zip_internal.cc", |
| 111 "google/zip_internal.h", | 110 "google/zip_internal.h", |
| 112 "google/zip_reader.cc", | 111 "google/zip_reader.cc", |
| 113 "google/zip_reader.h", | 112 "google/zip_reader.h", |
| 114 ] | 113 ] |
| 115 deps = [ | 114 deps = [ |
| 116 ":minizip", | 115 ":minizip", |
| 117 "//base", | 116 "//base", |
| 118 ] | 117 ] |
| 119 } | 118 } |
| OLD | NEW |