summaryrefslogtreecommitdiff
path: root/node.gyp
diff options
context:
space:
mode:
authorT.C. Hollingsworth <tchollingsworth@gmail.com>2012-02-26 16:02:21 -0700
committerBen Noordhuis <info@bnoordhuis.nl>2012-02-27 02:31:23 +0100
commitd03b8487c608cb030055a6ccff34ae59a230356a (patch)
tree584520651f8e5e14c2eee983bfb276d18e5f692c /node.gyp
parent3c68c85f182758132b1c07a9ab7da5119306a54b (diff)
downloadnode-d03b8487c608cb030055a6ccff34ae59a230356a.tar.gz
build: support shared zlib
Diffstat (limited to 'node.gyp')
-rw-r--r--node.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/node.gyp b/node.gyp
index 6dccd9e01..75faeb71f 100644
--- a/node.gyp
+++ b/node.gyp
@@ -6,6 +6,7 @@
'werror': '',
'node_use_dtrace': 'false',
'node_shared_v8%': 'false',
+ 'node_shared_zlib%': 'false',
'node_use_openssl%': 'true',
'node_use_system_openssl%': 'false',
'library_files': [
@@ -56,7 +57,6 @@
'dependencies': [
'deps/http_parser/http_parser.gyp:http_parser',
'deps/uv/uv.gyp:uv',
- 'deps/zlib/zlib.gyp:zlib',
'node_js2c#host',
],
@@ -158,6 +158,10 @@
'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
}],
+ [ 'node_shared_zlib=="false"', {
+ 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
+ }],
+
[ 'OS=="win"', {
'sources': [
'tools/msvs/res/node.rc',