diff options
Diffstat (limited to 'third_party/zlib/zlib.gyp')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index aef41ac..8c5ae44 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -5,6 +5,22 @@ { 'targets': [ { + 'target_name' : 'zlib_x86_simd', + 'type': 'static_library', + 'conditions': [ + # See http://crbug.com/420616 gyp on mac & ios doesn't apply cflags + ['OS!="ios" and OS!="mac" 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' ], + }], ['OS=="android"', { + 'toolsets': ['target', 'host'], + }], + ], + }, + { 'target_name': 'zlib', 'type': 'static_library', 'sources': [ @@ -31,11 +47,15 @@ 'trees.c', 'trees.h', 'uncompr.c', + 'x86.h', 'zconf.h', 'zlib.h', 'zutil.c', 'zutil.h', ], + 'dependencies' : [ + 'zlib_x86_simd' + ], 'include_dirs': [ '.', ], @@ -45,6 +65,9 @@ ], }, 'conditions': [ + ['OS!="ios" and OS!="mac" and (target_arch=="ia32" or target_arch=="x64")', { + 'sources' : [ 'x86.c', ], + }], ['OS!="win"', { 'product_name': 'chrome_zlib', }], ['OS=="android"', { |