diff options
| author | isaacs <i@izs.me> | 2012-02-24 02:11:28 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-02-24 02:12:14 +0400 |
| commit | a9130222bd36ac2c5dd7ae560f02bb99569749a7 (patch) | |
| tree | a136017eab19a871c4accb0e8612dac426499712 | |
| parent | d3b83726157a2700c4e90e9983b9dc5a205550ac (diff) | |
Revert "build: support shared V8 properly"
This reverts commit 3d1b67064085ef486a69c2fc69d195dc35f4f50c.
Breaks build on windows.
https://gist.github.com/1895279
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | node.gyp | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/configure b/configure index e72f9ea208c..b18e476f177 100755 --- a/configure +++ b/configure @@ -208,11 +208,8 @@ 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): @@ -54,6 +54,7 @@ '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', @@ -109,6 +110,8 @@ '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)', @@ -144,21 +147,6 @@ ], }], - [ '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', |