Merge pull request #12328 from electron/delay_load
Use same delay-load settings in both debug and release
This commit is contained in:
commit
f993888424
1 changed files with 38 additions and 30 deletions
|
@ -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',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue