mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to node v0.11.9.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-09 23:18:36 +08:00
parent 42ffa5813f
commit 0a37852757
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom.gyp
View file

@ -326,6 +326,8 @@
'include_dirs': [ 'include_dirs': [
'.', '.',
'vendor', 'vendor',
# The `node.h` is using `#include"v8.h"`.
'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

7
common.gypi
View file

@ -13,6 +13,7 @@
}], }],
], ],
# Reflects node's config.gypi. # Reflects node's config.gypi.
'component%': 'static_library',
'python': 'python', 'python': 'python',
'node_install_npm': 'false', 'node_install_npm': 'false',
'node_prefix': '', 'node_prefix': '',
@ -29,6 +30,7 @@
'node_use_openssl': 'true', 'node_use_openssl': 'true',
'node_use_perfctr': 'false', 'node_use_perfctr': 'false',
'node_use_systemtap': 'false', 'node_use_systemtap': 'false',
'v8_postmortem_support': 'false',
}, },
# Settings to compile node under Windows. # Settings to compile node under Windows.
'target_defaults': { 'target_defaults': {
@ -72,6 +74,11 @@
], ],
}, },
}], }],
['_target_name=="node"', {
'include_dirs': [
'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
],
}],
['_target_name=="libuv"', { ['_target_name=="libuv"', {
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 44483b45881e0757af30c092a562b8d0ff6cceeb Subproject commit 4b6ab23cb972a96bde40c899aab41703f08a1f0d