From 84ce3a9ea13671ad83d59597806cfcda274fafed Mon Sep 17 00:00:00 2001
From: Ales Pergl <alpergl@microsoft.com>
Date: Fri, 16 Mar 2018 17:09:39 +0100
Subject: [PATCH] Use same delay-load settings in both debug and release

---
 brightray/brightray.gyp | 68 +++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp
index d72fcfba3808..63ceb3e8a0c4 100644
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@@ -275,6 +275,44 @@
           ]
         }],  # OS=="mac"
         ['OS=="win"', {
+          'link_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'AdditionalDependencies': [
+                  'delayimp.lib',
+                ],
+                'DelayLoadDLLs': [
+                  'wtsapi32.dll',
+                  # content_common.gypi:
+                  'd3d9.dll',
+                  'd3d11.dll',
+                  'dxva2.dll',
+                  # media.gyp:
+                  'mf.dll',
+                  'mfplat.dll',
+                  'mfreadwrite.dll',
+                  # bluetooth.gyp:
+                  'BluetoothApis.dll',
+                  'Bthprops.cpl',
+                  'setupapi.dll',
+                  # base.gyp:
+                  'cfgmgr32.dll',
+                  'powrprof.dll',
+                  'setupapi.dll',
+                  # net_common.gypi:
+                  'crypt32.dll',
+                  'dhcpcsvc.dll',
+                  'rpcrt4.dll',
+                  'secur32.dll',
+                  'urlmon.dll',
+                  'winhttp.dll',
+                  # windows runtime
+                  'API-MS-WIN-CORE-WINRT-L1-1-0.DLL',
+                  'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
+                ],
+              },
+            },
+          },
           'conditions': [
             ['libchromiumcontent_component', {
               'link_settings': {
@@ -353,7 +391,6 @@
                     'AdditionalDependencies': [
                       'advapi32.lib',
                       'dbghelp.lib',
-                      'delayimp.lib',
                       'dwmapi.lib',
                       'gdi32.lib',
                       'netapi32.lib',
@@ -383,35 +420,6 @@
                       # skia/BUILD.gn:
                       'fontsub.lib',
                     ],
-                    'DelayLoadDLLs': [
-                      'wtsapi32.dll',
-                      # content_common.gypi:
-                      'd3d9.dll',
-                      'd3d11.dll',
-                      'dxva2.dll',
-                      # media.gyp:
-                      'mf.dll',
-                      'mfplat.dll',
-                      'mfreadwrite.dll',
-                      # bluetooth.gyp:
-                      'BluetoothApis.dll',
-                      'Bthprops.cpl',
-                      'setupapi.dll',
-                      # base.gyp:
-                      'cfgmgr32.dll',
-                      'powrprof.dll',
-                      'setupapi.dll',
-                      # net_common.gypi:
-                      'crypt32.dll',
-                      'dhcpcsvc.dll',
-                      'rpcrt4.dll',
-                      'secur32.dll',
-                      'urlmon.dll',
-                      'winhttp.dll',
-                      # windows runtime
-                      'API-MS-WIN-CORE-WINRT-L1-1-0.DLL',
-                      'API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL',
-                    ],
                   },
                 },
               },