From c8705625c9c6989b1d5c03f716e31e16fec6e543 Mon Sep 17 00:00:00 2001 From: Alexey Kuzmin Date: Mon, 27 Aug 2018 18:17:23 +0300 Subject: [PATCH] build: windows gn linker fix (#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 --- BUILD.gn | 10 ++++++---- DEPS | 2 +- vendor/node | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 1a5e526dbd2..0d364cef47e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -281,10 +281,7 @@ static_library("electron_lib") { if (is_component_build) { defines += [ - # Import V8 symbols from shared library (node.dll / libnode.so) - "USING_V8_SHARED", - "USING_V8_PLATFORM_SHARED", - "USING_V8_BASE_SHARED", + "NODE_SHARED_MODE", ] } @@ -390,6 +387,11 @@ static_library("electron_lib") { } 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 += [ "atom/browser/api/atom_api_desktop_capturer.cc", "atom/browser/api/atom_api_desktop_capturer.h", diff --git a/DEPS b/DEPS index b3b9d650b27..390a3a3f9ff 100644 --- a/DEPS +++ b/DEPS @@ -4,7 +4,7 @@ vars = { 'libchromiumcontent_revision': 'c85470a1c379b1c4bedb372c146521bc4be9b75d', 'node_version': - 'ece0a06ac8147efb5b5af431c21f312f1884616e', + '6d1bdd3ebf860ff878a1b5db4fd26fdda3932e21', 'chromium_git': 'https://chromium.googlesource.com', diff --git a/vendor/node b/vendor/node index ece0a06ac81..6d1bdd3ebf8 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit ece0a06ac8147efb5b5af431c21f312f1884616e +Subproject commit 6d1bdd3ebf860ff878a1b5db4fd26fdda3932e21