| Index: third_party/zlib/zlib.gyp
|
| diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
|
| index aef41ac2bd969dedff9e8f44ec821e8dddc357fb..f5a456d8ff5cc6f681a088757edc4dafff919e23 100644
|
| --- a/third_party/zlib/zlib.gyp
|
| +++ b/third_party/zlib/zlib.gyp
|
| @@ -5,6 +5,19 @@
|
| {
|
| 'targets': [
|
| {
|
| + 'target_name' : 'zlib_x86_simd',
|
| + 'type': 'static_library',
|
| + 'conditions': [
|
| + ['OS=="linux" and (target_arch=="ia32" or target_arch=="x64")', {
|
| + 'cflags' : ["-msse2", "-msse4.2", "-mpclmul"],
|
| + 'sources' : [ 'crc_folding.c',
|
| + 'fill_window_sse.c']
|
| + }, {
|
| + 'sources' : [ 'simd_stub.c' ],
|
| + }],
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'zlib',
|
| 'type': 'static_library',
|
| 'sources': [
|
| @@ -31,11 +44,16 @@
|
| 'trees.c',
|
| 'trees.h',
|
| 'uncompr.c',
|
| + 'x86.h',
|
| + 'x86.c',
|
| 'zconf.h',
|
| 'zlib.h',
|
| 'zutil.c',
|
| 'zutil.h',
|
| ],
|
| + 'dependencies' : [
|
| + 'zlib_x86_simd'
|
| + ],
|
| 'include_dirs': [
|
| '.',
|
| ],
|
| @@ -45,6 +63,9 @@
|
| ],
|
| },
|
| 'conditions': [
|
| + ['OS=="linux" and (target_arch=="ia32" or target_arch=="x64")', {
|
| + 'defines' : ["HAVE_ARCH_INTEL"],
|
| + }],
|
| ['OS!="win"', {
|
| 'product_name': 'chrome_zlib',
|
| }], ['OS=="android"', {
|
|
|