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

Only use the osfhandle hack on Windows

Browse source
This commit is contained in:
Cheng Zhao 2016-05-19 17:02:40 +09:00
parent e609a5bee2
commit f8c1db160e
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common.gypi
View file

@ -118,12 +118,7 @@
], ],
}], }],
['_target_name=="node"', { ['_target_name=="node"', {
'sources': [
'<(DEPTH)/atom/node/osfhandle.cc',
'<(DEPTH)/atom/node/osfhandle.h',
],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/atom/node',
'<(libchromiumcontent_src_dir)/v8', '<(libchromiumcontent_src_dir)/v8',
'<(libchromiumcontent_src_dir)/v8/include', '<(libchromiumcontent_src_dir)/v8/include',
], ],
@ -135,7 +130,17 @@
}, },
}], }],
['OS=="win"', { ['OS=="win"', {
# Fix passing fd across modules, see |osfhandle.h| for more.
'sources': [
'<(DEPTH)/atom/node/osfhandle.cc',
'<(DEPTH)/atom/node/osfhandle.h',
],
'include_dirs': [
'<(DEPTH)/atom/node',
],
# Node is using networking API but linking with this itself.
'libraries': [ '-lwinmm.lib' ], 'libraries': [ '-lwinmm.lib' ],
# Fix the linking error with icu.
'conditions': [ 'conditions': [
['libchromiumcontent_component==0', { ['libchromiumcontent_component==0', {
'variables': { 'variables': {