diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 18:55:07 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 18:55:07 +0000 |
| commit | 262220e4e967bf2dbc1012241a2eb1d72667b10d (patch) | |
| tree | 3f75b9958b65b2adc17337aab017593f54e6d209 /third_party/zlib | |
| parent | ae5f11a2b2ec2dc3b89655fe21ad84730e8d70fb (diff) | |
| download | chromium_src-262220e4e967bf2dbc1012241a2eb1d72667b10d.zip chromium_src-262220e4e967bf2dbc1012241a2eb1d72667b10d.tar.gz chromium_src-262220e4e967bf2dbc1012241a2eb1d72667b10d.tar.bz2 | |
Linux: add an option to use system minizip.
This is helpful for Linux distros, I've tested this CL
on Gentoo Linux.
Google Chrome defaults to bundled minizip, so no change here.
BUG=29048
TEST=none
Review URL: https://codereview.chromium.org/11214002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index d856897..e04acbd 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -14,6 +14,7 @@ 'use_system_zlib%': 0, }], ], + 'use_system_minizip%': 0, }, 'targets': [ { @@ -22,14 +23,6 @@ 'conditions': [ ['use_system_zlib==0', { 'sources': [ - 'contrib/minizip/ioapi.c', - 'contrib/minizip/ioapi.h', - 'contrib/minizip/iowin32.c', - 'contrib/minizip/iowin32.h', - 'contrib/minizip/unzip.c', - 'contrib/minizip/unzip.h', - 'contrib/minizip/zip.c', - 'contrib/minizip/zip.h', 'adler32.c', 'compress.c', 'crc32.c', @@ -56,8 +49,6 @@ ], 'include_dirs': [ '.', - # For contrib/minizip - '../..', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -67,9 +58,6 @@ 'conditions': [ ['OS!="win"', { 'product_name': 'chrome_zlib', - 'sources!': [ - 'contrib/minizip/iowin32.c' - ], }], ['OS=="android"', { 'toolsets': ['target', 'host'], }], @@ -83,22 +71,60 @@ 'defines': [ 'USE_SYSTEM_ZLIB', ], + 'link_settings': { + 'libraries': [ + '-lz', + ], + }, + }], + ], + }, + { + 'target_name': 'minizip', + 'type': 'static_library', + 'conditions': [ + ['use_system_minizip==0', { 'sources': [ 'contrib/minizip/ioapi.c', 'contrib/minizip/ioapi.h', + 'contrib/minizip/iowin32.c', + 'contrib/minizip/iowin32.h', 'contrib/minizip/unzip.c', 'contrib/minizip/unzip.h', 'contrib/minizip/zip.c', 'contrib/minizip/zip.h', ], + 'include_dirs': [ + '.', + '../..', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '.', + ], + }, 'conditions': [ + ['OS!="win"', { + 'sources!': [ + 'contrib/minizip/iowin32.c' + ], + }], ['OS=="android"', { 'toolsets': ['target', 'host'], }], ], + }, { + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_MINIZIP', + ], + }, + 'defines': [ + 'USE_SYSTEM_MINIZIP', + ], 'link_settings': { 'libraries': [ - '-lz', + '-lminizip', ], }, }], |