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

build: windows gn linker fix (#14281)

Browse source 
* Fix to gn build linking

* chore: update node ref

* build: [gn win] add dependency on desktop_capture source_set in component build

* build: [gn] update definitions for node shared mode

* chore: update node ref

* chore: update node ref
This commit is contained in:
Alexey Kuzmin 2018-08-27 18:17:23 +03:00 committed by John Kleinschmidt
parent edd1eaee5c
commit c8705625c9
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BUILD.gn
View file

@ -281,10 +281,7 @@ static_library("electron_lib") {
if (is_component_build) { if (is_component_build) {
defines += [ defines += [
# Import V8 symbols from shared library (node.dll / libnode.so) "NODE_SHARED_MODE",
"USING_V8_SHARED",
"USING_V8_PLATFORM_SHARED",
"USING_V8_BASE_SHARED",
] ]
} }
@ -390,6 +387,11 @@ static_library("electron_lib") {
} }
if (enable_desktop_capturer) { if (enable_desktop_capturer) {
if (is_component_build && is_win) {
# On windows the implementation relies on unexported
# DxgiDuplicatorController class.
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
}
sources += [ sources += [
"atom/browser/api/atom_api_desktop_capturer.cc", "atom/browser/api/atom_api_desktop_capturer.cc",
"atom/browser/api/atom_api_desktop_capturer.h", "atom/browser/api/atom_api_desktop_capturer.h",

2
DEPS
View file

@ -4,7 +4,7 @@ vars = {
'libchromiumcontent_revision': 'libchromiumcontent_revision':
'c85470a1c379b1c4bedb372c146521bc4be9b75d', 'c85470a1c379b1c4bedb372c146521bc4be9b75d',
'node_version': 'node_version':
'ece0a06ac8147efb5b5af431c21f312f1884616e', '6d1bdd3ebf860ff878a1b5db4fd26fdda3932e21',
'chromium_git': 'chromium_git':
'https://chromium.googlesource.com', 'https://chromium.googlesource.com',

2
vendor/node vendored

@ -1 +1 @@
Subproject commit ece0a06ac8147efb5b5af431c21f312f1884616e Subproject commit 6d1bdd3ebf860ff878a1b5db4fd26fdda3932e21