Skip to content

Commit c870562

Browse files
alexeykuzminJohn Kleinschmidt
authored andcommitted
build: windows gn linker fix (electron#14281)
* 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
1 parent edd1eae commit c870562

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

BUILD.gn

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,7 @@ static_library("electron_lib") {
281281

282282
if (is_component_build) {
283283
defines += [
284-
# Import V8 symbols from shared library (node.dll / libnode.so)
285-
"USING_V8_SHARED",
286-
"USING_V8_PLATFORM_SHARED",
287-
"USING_V8_BASE_SHARED",
284+
"NODE_SHARED_MODE",
288285
]
289286
}
290287

@@ -390,6 +387,11 @@ static_library("electron_lib") {
390387
}
391388

392389
if (enable_desktop_capturer) {
390+
if (is_component_build && is_win) {
391+
# On windows the implementation relies on unexported
392+
# DxgiDuplicatorController class.
393+
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
394+
}
393395
sources += [
394396
"atom/browser/api/atom_api_desktop_capturer.cc",
395397
"atom/browser/api/atom_api_desktop_capturer.h",

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'libchromiumcontent_revision':
55
'c85470a1c379b1c4bedb372c146521bc4be9b75d',
66
'node_version':
7-
'ece0a06ac8147efb5b5af431c21f312f1884616e',
7+
'6d1bdd3ebf860ff878a1b5db4fd26fdda3932e21',
88

99
'chromium_git':
1010
'https://chromium.googlesource.com',

vendor/node

0 commit comments

Comments
 (0)