From 289649a919d557182ff951589fc9859778206e4c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 20 Dec 2013 12:26:40 +0800 Subject: [PATCH] Add "node" target which builds a shared library. With this other projects would be possible to include node as a third party library and embed a node engine in their applications. --- node.gyp | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/node.gyp b/node.gyp index 0e8fd576f0..d431210c7c 100644 --- a/node.gyp +++ b/node.gyp @@ -89,8 +89,8 @@ 'dependencies': [ 'node_js2c#host', 'deps/cares/cares.gyp:cares', - 'deps/v8/tools/gyp/v8.gyp:v8', - 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' + # 'deps/v8/tools/gyp/v8.gyp:v8', + # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' ], 'include_dirs': [ @@ -98,7 +98,7 @@ 'tools/msvs/genfiles', 'deps/uv/src/ares', '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h - 'deps/v8' # include/v8_platform.h + # 'deps/v8' # include/v8_platform.h ], 'sources': [ @@ -240,29 +240,6 @@ [ 'node_shared_openssl=="false"', { 'dependencies': [ './deps/openssl/openssl.gyp:openssl', - - # For tests - './deps/openssl/openssl.gyp:openssl-cli', - ], - # Do not let unused OpenSSL symbols to slip away - 'conditions': [ - # -force_load or --whole-archive are not applicable for - # the static library - [ 'node_target_type!="static_library"', { - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)', - ], - }, - 'conditions': [ - ['OS in "linux freebsd"', { - 'ldflags': [ - '-Wl,--whole-archive <(PRODUCT_DIR)/<(OPENSSL_PRODUCT)', - '-Wl,--no-whole-archive', - ], - }], - ], - }], ], }]] }, { @@ -427,12 +404,6 @@ 'ldflags': [ '-Wl,-M,/usr/lib/ld/map.noexstk' ], }], ], - 'msvs_settings': { - 'VCManifestTool': { - 'EmbedManifest': 'true', - 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest' - } - }, }, # generate ETW header and resource files { @@ -655,8 +626,8 @@ 'type': 'executable', 'dependencies': [ 'deps/gtest/gtest.gyp:gtest', - 'deps/v8/tools/gyp/v8.gyp:v8', - 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' + # 'deps/v8/tools/gyp/v8.gyp:v8', + # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' ], 'include_dirs': [ 'src',