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

Side by Side Diff: third_party/zlib/zlib.gyp

Issue 665203006: Revert of Reland "Integrate SIMD optimisations for zlib" (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 | « third_party/zlib/x86.c ('k') | third_party/zlib/zutil.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name' : 'zlib_x86_simd',
9 'type': 'static_library',
10 'conditions': [
11 # See http://crbug.com/420616 gyp on mac & ios doesn't apply cflags
12 ['OS!="ios" and OS!="mac" and (target_arch=="ia32" or target_arch=="x64" )', {
13 'cflags' : ["-msse2", "-msse4.2", "-mpclmul"],
14 'sources' : [ 'crc_folding.c',
15 'fill_window_sse.c']
16 }, {
17 'sources' : [ 'simd_stub.c' ],
18 }], ['OS=="android"', {
19 'toolsets': ['target', 'host'],
20 }],
21 ],
22 },
23 {
24 'target_name': 'zlib', 8 'target_name': 'zlib',
25 'type': 'static_library', 9 'type': 'static_library',
26 'sources': [ 10 'sources': [
27 'adler32.c', 11 'adler32.c',
28 'compress.c', 12 'compress.c',
29 'crc32.c', 13 'crc32.c',
30 'crc32.h', 14 'crc32.h',
31 'deflate.c', 15 'deflate.c',
32 'deflate.h', 16 'deflate.h',
33 'gzclose.c', 17 'gzclose.c',
34 'gzguts.h', 18 'gzguts.h',
35 'gzlib.c', 19 'gzlib.c',
36 'gzread.c', 20 'gzread.c',
37 'gzwrite.c', 21 'gzwrite.c',
38 'infback.c', 22 'infback.c',
39 'inffast.c', 23 'inffast.c',
40 'inffast.h', 24 'inffast.h',
41 'inffixed.h', 25 'inffixed.h',
42 'inflate.c', 26 'inflate.c',
43 'inflate.h', 27 'inflate.h',
44 'inftrees.c', 28 'inftrees.c',
45 'inftrees.h', 29 'inftrees.h',
46 'mozzconf.h', 30 'mozzconf.h',
47 'trees.c', 31 'trees.c',
48 'trees.h', 32 'trees.h',
49 'uncompr.c', 33 'uncompr.c',
50 'x86.h',
51 'zconf.h', 34 'zconf.h',
52 'zlib.h', 35 'zlib.h',
53 'zutil.c', 36 'zutil.c',
54 'zutil.h', 37 'zutil.h',
55 ], 38 ],
56 'dependencies' : [
57 'zlib_x86_simd'
58 ],
59 'include_dirs': [ 39 'include_dirs': [
60 '.', 40 '.',
61 ], 41 ],
62 'direct_dependent_settings': { 42 'direct_dependent_settings': {
63 'include_dirs': [ 43 'include_dirs': [
64 '.', 44 '.',
65 ], 45 ],
66 }, 46 },
67 'conditions': [ 47 'conditions': [
68 ['OS!="ios" and OS!="mac" and (target_arch=="ia32" or target_arch=="x64" )', {
69 'sources' : [ 'x86.c', ],
70 }],
71 ['OS!="win"', { 48 ['OS!="win"', {
72 'product_name': 'chrome_zlib', 49 'product_name': 'chrome_zlib',
73 }], ['OS=="android"', { 50 }], ['OS=="android"', {
74 'toolsets': ['target', 'host'], 51 'toolsets': ['target', 'host'],
75 }], 52 }],
76 ], 53 ],
77 }, 54 },
78 { 55 {
79 'target_name': 'minizip', 56 'target_name': 'minizip',
80 'type': 'static_library', 57 'type': 'static_library',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 # fseeko64. We use fopen, ftell, and fseek instead on these 97 # fseeko64. We use fopen, ftell, and fseek instead on these
121 # systems. 98 # systems.
122 'defines': [ 99 'defines': [
123 'USE_FILE32API' 100 'USE_FILE32API'
124 ], 101 ],
125 }], 102 }],
126 ], 103 ],
127 }, 104 },
128 ], 105 ],
129 } 106 }
OLDNEW
« no previous file with comments | « third_party/zlib/x86.c ('k') | third_party/zlib/zutil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698