diff options
| author | isaacs <i@izs.me> | 2012-02-23 14:52:18 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-02-23 14:52:18 -0800 |
| commit | 59ecf2ccf743489a2885cf824460070e6fc12d6a (patch) | |
| tree | c7c275360e6de2862494532aae22688aa70eeac2 /node.gyp | |
| parent | f492baa61dd1fa2955fc3821b34fb5c998c81503 (diff) | |
| download | android-node-v8-59ecf2ccf743489a2885cf824460070e6fc12d6a.tar.gz android-node-v8-59ecf2ccf743489a2885cf824460070e6fc12d6a.tar.bz2 android-node-v8-59ecf2ccf743489a2885cf824460070e6fc12d6a.zip | |
Revert "Revert "build: support shared V8 properly""
This reverts commit a9130222bd36ac2c5dd7ae560f02bb99569749a7.
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -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', |