summaryrefslogtreecommitdiff
path: root/node.gyp
diff options
context:
space:
mode:
authorT.C. Hollingsworth <tchollingsworth@gmail.com>2012-02-22 04:57:32 -0700
committerBen Noordhuis <info@bnoordhuis.nl>2012-02-22 15:20:23 +0100
commit3d1b67064085ef486a69c2fc69d195dc35f4f50c (patch)
tree146babf8400e80d56f116b321eefde4172483855 /node.gyp
parent21374c3903caa1d752b4212296cf0898483a56ab (diff)
downloadandroid-node-v8-3d1b67064085ef486a69c2fc69d195dc35f4f50c.tar.gz
android-node-v8-3d1b67064085ef486a69c2fc69d195dc35f4f50c.tar.bz2
android-node-v8-3d1b67064085ef486a69c2fc69d195dc35f4f50c.zip
build: support shared V8 properly
-don't pull in bundled v8 as a dependency when node_shared_v8==true -use node_shared_v8_includes for v8.h and v8-debug.h
Diffstat (limited to 'node.gyp')
-rw-r--r--node.gyp18
1 files changed, 15 insertions, 3 deletions
diff --git a/node.gyp b/node.gyp
index 24f579e054..151b47d35d 100644
--- a/node.gyp
+++ b/node.gyp
@@ -54,7 +54,6 @@
'dependencies': [
'deps/http_parser/http_parser.gyp:http_parser',
- 'deps/v8/tools/gyp/v8.gyp:v8',
'deps/uv/uv.gyp:uv',
'deps/zlib/zlib.gyp:zlib',
'node_js2c#host',
@@ -110,8 +109,6 @@
'src/stream_wrap.h',
'src/v8_typed_array.h',
'deps/http_parser/http_parser.h',
- 'deps/v8/include/v8.h',
- 'deps/v8/include/v8-debug.h',
'<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
# javascript files to make for an even more pleasant IDE experience
'<@(library_files)',
@@ -147,6 +144,21 @@
],
}],
+ [ 'node_shared_v8=="true"', {
+ 'sources': [
+ '<(node_shared_v8_includes)/v8.h',
+ '<(node_shared_v8_includes)/v8-debug.h',
+ ],
+ }],
+
+ [ 'node_shared_v8=="false"', {
+ 'sources': [
+ 'deps/v8/include/v8.h',
+ 'deps/v8/include/v8-debug.h',
+ ],
+ 'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
+ }],
+
[ 'OS=="win"', {
'sources': [
'tools/msvs/res/node.rc',