Browse Source

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
Alexey Kuzmin 6 years ago
parent
commit
c8705625c9
3 changed files with 8 additions and 6 deletions
  1. 6 4
      BUILD.gn
  2. 1 1
      DEPS
  3. 1 1
      vendor/node

+ 6 - 4
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",

+ 1 - 1
DEPS

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

+ 1 - 1
vendor/node

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