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

Side by Side Diff: gyp/skflate.gyp

Issue 469813002: Add miniz library to third_party, use it on Windows (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 months 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 | « no previous file | src/core/SkFlate.cpp » ('j') | src/core/SkFlate.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Target for including SkFlate. 1 # Target for including SkFlate.
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'skflate', 5 'target_name': 'skflate',
6 'type': 'static_library', 6 'type': 'static_library',
7 'dependencies': [ 7 'dependencies': [
8 'skia_lib.gyp:skia_lib', 8 'skia_lib.gyp:skia_lib',
9 ], 9 ],
10 'conditions': [ 10 'conditions': [
11 # When zlib is not availible on a system, 11 # When zlib is not availible on a system,
mtklein 2014/08/13 17:57:09 If this works out, might consider using miniz ever
hal.canary 2014/08/13 18:04:24 Yes but Chromium and Android still use zlib everyw
12 # SkFlate::HaveFlate will just return false. 12 # SkFlate::HaveFlate will just return false.
13 [ 'skia_os != "win"', 13 [ 'skia_os != "win"',
14 { 14 {
15 'dependencies': [ 15 'dependencies': [
16 'zlib.gyp:zlib', 16 'zlib.gyp:zlib',
17 ], 17 ],
18 }, { # 'skia_os == "win"'
19 'dependencies': [
20 '../third_party/miniz/miniz.gyp:miniz'
21 ],
18 } 22 }
19 ], 23 ],
20 ], 24 ],
21 'sources': [ 25 'sources': [
22 '../src/core/SkFlate.cpp', 26 '../src/core/SkFlate.cpp',
23 ], 27 ],
24 }, 28 },
25 ], 29 ],
26 } 30 }
OLDNEW
« no previous file with comments | « no previous file | src/core/SkFlate.cpp » ('j') | src/core/SkFlate.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698