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

Update node: Removed two unused patches.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-20 14:20:24 +08:00
parent f646d2dda8
commit 902be9bab5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom.gyp
View file

@ -320,7 +320,7 @@
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'vendor/brightray/brightray.gyp:brightray', 'vendor/brightray/brightray.gyp:brightray',
'vendor/node/node.gyp:node', 'vendor/node/node.gyp:node_lib',
], ],
'sources': [ 'sources': [
'<@(lib_sources)', '<@(lib_sources)',

4
common.gypi
View file

@ -35,7 +35,7 @@
# Settings to compile node under Windows. # Settings to compile node under Windows.
'target_defaults': { 'target_defaults': {
'target_conditions': [ 'target_conditions': [
['_target_name in ["libuv", "http_parser", "cares", "openssl", "node", "zlib"]', { ['_target_name in ["libuv", "http_parser", "cares", "openssl", "node_lib", "zlib"]', {
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4013, # 'free' undefined; assuming extern returning int 4013, # 'free' undefined; assuming extern returning int
4054, # 4054, #
@ -76,7 +76,7 @@
], ],
}, },
}], }],
['_target_name=="node"', { ['_target_name in ["node_lib", "atom_lib"]', {
'include_dirs': [ 'include_dirs': [
'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include', 'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
], ],

2
vendor/node vendored

@ -1 +1 @@
Subproject commit efc9599187eb8a3b350b8f6eb7aa463a7d1c329f Subproject commit b5bbfb6a7d66750c21bf654e973f47f1178adced