deps: don't build minizip into zlib
It's an optional extension that node/iojs doesn't use. PR-URL: https://github.com/iojs/io.js/pull/276 Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
parent
ad37509c0b
commit
a80b9777f2
21
deps/zlib/zlib.gyp
vendored
21
deps/zlib/zlib.gyp
vendored
@ -13,14 +13,6 @@
|
|||||||
'target_name': 'zlib',
|
'target_name': 'zlib',
|
||||||
'type': 'static_library',
|
'type': 'static_library',
|
||||||
'sources': [
|
'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',
|
'adler32.c',
|
||||||
'compress.c',
|
'compress.c',
|
||||||
'crc32.c',
|
'crc32.c',
|
||||||
@ -50,8 +42,6 @@
|
|||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'.',
|
'.',
|
||||||
# For contrib/minizip
|
|
||||||
'./contrib/minizip',
|
|
||||||
],
|
],
|
||||||
'direct_dependent_settings': {
|
'direct_dependent_settings': {
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
@ -62,9 +52,6 @@
|
|||||||
['OS!="win"', {
|
['OS!="win"', {
|
||||||
'cflags!': [ '-ansi' ],
|
'cflags!': [ '-ansi' ],
|
||||||
'defines': [ 'Z_HAVE_UNISTD_H' ],
|
'defines': [ 'Z_HAVE_UNISTD_H' ],
|
||||||
'sources!': [
|
|
||||||
'contrib/minizip/iowin32.c'
|
|
||||||
],
|
|
||||||
}],
|
}],
|
||||||
['OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="android"', {
|
['OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="android"', {
|
||||||
# Mac, Android and the BSDs don't have fopen64, ftello64, or
|
# Mac, Android and the BSDs don't have fopen64, ftello64, or
|
||||||
@ -90,14 +77,6 @@
|
|||||||
'defines': [
|
'defines': [
|
||||||
'USE_SYSTEM_ZLIB',
|
'USE_SYSTEM_ZLIB',
|
||||||
],
|
],
|
||||||
'sources': [
|
|
||||||
'contrib/minizip/ioapi.c',
|
|
||||||
'contrib/minizip/ioapi.h',
|
|
||||||
'contrib/minizip/unzip.c',
|
|
||||||
'contrib/minizip/unzip.h',
|
|
||||||
'contrib/minizip/zip.c',
|
|
||||||
'contrib/minizip/zip.h',
|
|
||||||
],
|
|
||||||
'link_settings': {
|
'link_settings': {
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'-lz',
|
'-lz',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user