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

Merge pull request #12328 from electron/delay_load

Browse source 
Use same delay-load settings in both debug and release
This commit is contained in:
Cheng Zhao 2018-03-17 11:32:30 +09:00 committed by GitHub
commit f993888424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
brightray/brightray.gyp
View file

@ -275,6 +275,44 @@
] ]
}], # OS=="mac" }], # OS=="mac"
['OS=="win"', { ['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': [ 'conditions': [
['libchromiumcontent_component', { ['libchromiumcontent_component', {
'link_settings': { 'link_settings': {
@ -353,7 +391,6 @@
'AdditionalDependencies': [ 'AdditionalDependencies': [
'advapi32.lib', 'advapi32.lib',
'dbghelp.lib', 'dbghelp.lib',
'delayimp.lib',
'dwmapi.lib', 'dwmapi.lib',
'gdi32.lib', 'gdi32.lib',
'netapi32.lib', 'netapi32.lib',
@ -383,35 +420,6 @@
# skia/BUILD.gn: # skia/BUILD.gn:
'fontsub.lib', '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',
],
}, },
}, },
}, },