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

win: Fix linking

Browse source
This commit is contained in:
Cheng Zhao 2015-04-06 14:21:21 +08:00
parent e64101e31f
commit 938069a389
5 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom.gyp
View file

@ -124,7 +124,6 @@
{ {
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ 'files': [
'<(libchromiumcontent_dir)/chromiumcontent.dll',
'<(libchromiumcontent_dir)/ffmpegsumo.dll', '<(libchromiumcontent_dir)/ffmpegsumo.dll',
'<(libchromiumcontent_dir)/libEGL.dll', '<(libchromiumcontent_dir)/libEGL.dll',
'<(libchromiumcontent_dir)/libGLESv2.dll', '<(libchromiumcontent_dir)/libGLESv2.dll',
@ -232,6 +231,14 @@
], ],
}, },
'dependencies': [ 'dependencies': [
# Node is built as static_library on Windows, so we also need to
# include its dependencies here.
'vendor/node/deps/cares/cares.gyp:cares',
'vendor/node/deps/http_parser/http_parser.gyp:http_parser',
'vendor/node/deps/openssl/openssl.gyp:openssl',
'vendor/node/deps/uv/uv.gyp:libuv',
'vendor/node/deps/zlib/zlib.gyp:zlib',
# Build with breakpad support.
'vendor/breakpad/breakpad.gyp:breakpad_handler', 'vendor/breakpad/breakpad.gyp:breakpad_handler',
'vendor/breakpad/breakpad.gyp:breakpad_sender', 'vendor/breakpad/breakpad.gyp:breakpad_sender',
], ],
@ -621,8 +628,7 @@
{ {
'action_name': 'Create node.lib', 'action_name': 'Create node.lib',
'inputs': [ 'inputs': [
'<(PRODUCT_DIR)/node.dll.lib', '<(PRODUCT_DIR)/<(project_name).lib',
'<(libchromiumcontent_dir)/chromiumcontent.dll.lib',
], ],
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/node.lib', '<(PRODUCT_DIR)/node.lib',

26
atom/common/node_bindings.cc
View file

@ -27,6 +27,32 @@ using content::BrowserThread;
#define REFERENCE_MODULE(name) \ #define REFERENCE_MODULE(name) \
extern "C" void _register_ ## name(void); \ extern "C" void _register_ ## name(void); \
void (*fp_register_ ## name)(void) = _register_ ## name void (*fp_register_ ## name)(void) = _register_ ## name
#if defined(OS_WIN)
// On Windows Node is built as static_library so we need to reference Node's
// builtin modules.
REFERENCE_MODULE(cares_wrap);
REFERENCE_MODULE(fs_event_wrap);
REFERENCE_MODULE(buffer);
REFERENCE_MODULE(contextify);
REFERENCE_MODULE(crypto);
REFERENCE_MODULE(fs);
REFERENCE_MODULE(http_parser);
REFERENCE_MODULE(os);
REFERENCE_MODULE(v8);
REFERENCE_MODULE(zlib);
REFERENCE_MODULE(pipe_wrap);
REFERENCE_MODULE(process_wrap);
REFERENCE_MODULE(signal_wrap);
REFERENCE_MODULE(smalloc);
REFERENCE_MODULE(spawn_sync);
REFERENCE_MODULE(tcp_wrap);
REFERENCE_MODULE(timer_wrap);
REFERENCE_MODULE(tls_wrap);
REFERENCE_MODULE(tty_wrap);
REFERENCE_MODULE(udp_wrap);
REFERENCE_MODULE(uv);
REFERENCE_MODULE(js_stream);
#endif // defined(OS_WIN)
// Atom Shell's builtin modules. // Atom Shell's builtin modules.
REFERENCE_MODULE(atom_browser_app); REFERENCE_MODULE(atom_browser_app);
REFERENCE_MODULE(atom_browser_auto_updater); REFERENCE_MODULE(atom_browser_auto_updater);

2
atom/common/node_includes.h
View file

@ -7,8 +7,6 @@
// Include common headers for using node APIs. // Include common headers for using node APIs.
#define BUILDING_NODE_EXTENSION
#undef ASSERT #undef ASSERT
#undef CHECK #undef CHECK
#undef CHECK_EQ #undef CHECK_EQ

4
common.gypi
View file

@ -115,9 +115,7 @@
}, },
}], }],
['OS=="win"', { ['OS=="win"', {
'libraries': [ 'type': 'static_library',
'<(libchromiumcontent_root_dir)/shared_library/v8.dll.lib',
],
}], }],
['OS=="linux"', { ['OS=="linux"', {
'cflags': [ '-fPIC' ], 'cflags': [ '-fPIC' ],

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 5c1141338e1a6abee87583f708e61236ac2a9c35 Subproject commit cd70f45a19dcb73b15d9e9567ee082330a168a85