Revert "Revert "build: support shared V8 properly""

This reverts commit a9130222bd36ac2c5dd7ae560f02bb99569749a7.

diff --git a/configure b/configure
index 5a3dc8d..7734a17 100755 (executable)
--- a/configure
+++ b/configure
@@ -209,8 +209,11 @@ def configure_v8(o):
     o['libraries'] += ['-L%s' % options.shared_v8_libpath]
   if options.shared_v8_libname:
     o['libraries'] += ['-l%s' % options.shared_v8_libname]
+  elif options.shared_v8:
+    o['libraries'] += ['-lv8']
   if options.shared_v8_includes:
     o['include_dirs'] += [options.shared_v8_includes]
+    o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
 
 
 def configure_cares(o):

diff --git a/node.gyp b/node.gyp
index 24f579e..151b47d 100644 (file)
--- 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',