summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNathan Rajlich <nathan@tootallnate.net>2012-01-06 15:48:23 -0800
committerBert Belder <bertbelder@gmail.com>2012-02-06 19:02:45 +0100
commit5e1471c806a387d9953ba3387892190d7f423fbb (patch)
tree1d66d4331790e4d3b3cdd61d5536ca510bc954b9 /tools
parentc2dc673eb5a7a6a706b024a5e501cd3939ad399b (diff)
downloadandroid-node-v8-5e1471c806a387d9953ba3387892190d7f423fbb.tar.gz
android-node-v8-5e1471c806a387d9953ba3387892190d7f423fbb.tar.bz2
android-node-v8-5e1471c806a387d9953ba3387892190d7f423fbb.zip
gyp_addon: link with node.lib on Windows
Closes GH-2685
Diffstat (limited to 'tools')
-rw-r--r--tools/addon.gypi3
-rwxr-xr-xtools/gyp_addon1
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/addon.gypi b/tools/addon.gypi
index e7152afe4b..e8fb4e2897 100644
--- a/tools/addon.gypi
+++ b/tools/addon.gypi
@@ -12,6 +12,9 @@
'conditions': [
[ 'OS=="mac"', {
'libraries': [ '-undefined dynamic_lookup' ],
+ }],
+ [ 'OS=="win"', {
+ 'libraries': [ '-l<(node_root_dir)/$(Configuration)/node.lib' ],
}]
]
}
diff --git a/tools/gyp_addon b/tools/gyp_addon
index a93f7b27d9..2dac0e004d 100755
--- a/tools/gyp_addon
+++ b/tools/gyp_addon
@@ -16,6 +16,7 @@ if __name__ == '__main__':
args.extend(['-I', common_gypi])
args.extend(['-Dlibrary=shared_library'])
args.extend(['-Dvisibility=default'])
+ args.extend(['-Dnode_root_dir=%s' % node_root])
args.extend(['--depth=.']);
gyp_args = list(args)