Chromium Code Reviews| 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 (cpu_arch == "x86" || cpu_arch == "x64") { | 10 if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) { |
|
Nico
2014/11/18 19:13:43
This isn't correct. The gyp version does use crc_f
Dirk Pranke
2014/11/18 20:37:45
Okay, good to know. I'll try to fix that in a foll
| |
| 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 } | |
| 15 } | 19 } |
| 16 } | 20 } |
| 17 | 21 |
| 18 static_library("zlib") { | 22 static_library("zlib") { |
| 19 if (!is_win) { | 23 if (!is_win) { |
| 20 # Don't stomp on "libzlib" on other platforms. | 24 # Don't stomp on "libzlib" on other platforms. |
| 21 output_name = "chrome_zlib" | 25 output_name = "chrome_zlib" |
| 22 } | 26 } |
| 23 | 27 |
| 24 sources = [ | 28 sources = [ |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 45 "trees.c", | 49 "trees.c", |
| 46 "trees.h", | 50 "trees.h", |
| 47 "uncompr.c", | 51 "uncompr.c", |
| 48 "x86.h", | 52 "x86.h", |
| 49 "zconf.h", | 53 "zconf.h", |
| 50 "zlib.h", | 54 "zlib.h", |
| 51 "zutil.c", | 55 "zutil.c", |
| 52 "zutil.h", | 56 "zutil.h", |
| 53 ] | 57 ] |
| 54 | 58 |
| 55 if (cpu_arch == "x86" || cpu_arch == "x64") { | 59 if (!is_win && (cpu_arch == "x86" || cpu_arch == "x64")) { |
| 56 sources += [ "x86.c" ] | 60 sources += [ "x86.c" ] |
| 57 } | 61 } |
| 58 | 62 |
| 59 configs -= [ "//build/config/compiler:chromium_code" ] | 63 configs -= [ "//build/config/compiler:chromium_code" ] |
| 60 configs += [ "//build/config/compiler:no_chromium_code" ] | 64 configs += [ "//build/config/compiler:no_chromium_code" ] |
| 61 | 65 |
| 62 public_configs = [ ":zlib_config" ] | 66 public_configs = [ ":zlib_config" ] |
| 63 deps = [ ":zlib_x86_simd" ] | 67 deps = [ ":zlib_x86_simd" ] |
| 64 } | 68 } |
| 65 | 69 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 106 "google/zip_internal.cc", | 110 "google/zip_internal.cc", |
| 107 "google/zip_internal.h", | 111 "google/zip_internal.h", |
| 108 "google/zip_reader.cc", | 112 "google/zip_reader.cc", |
| 109 "google/zip_reader.h", | 113 "google/zip_reader.h", |
| 110 ] | 114 ] |
| 111 deps = [ | 115 deps = [ |
| 112 ":minizip", | 116 ":minizip", |
| 113 "//base", | 117 "//base", |
| 114 ] | 118 ] |
| 115 } | 119 } |
| OLD | NEW |