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

win: Build with downloaded ATL instead of the ATL shipped by WDK.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-08 14:18:32 +08:00
parent 1cadc9221a
commit 0f5d929c09
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common.gypi
View file

@ -7,7 +7,6 @@
}], }],
['OS=="win" and (MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', { ['OS=="win" and (MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', {
'msvs_express': 1, 'msvs_express': 1,
'windows_driver_kit_path%': 'C:/WinDDK/7600.16385.1',
},{ },{
'msvs_express': 0, 'msvs_express': 0,
}], }],
@ -135,6 +134,7 @@
'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail. 'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4005, # (node.h) macro redefinition 4005, # (node.h) macro redefinition
4099, # PDB 'atls.pdb' was not found with 'atls.lib'
4189, # local variable is initialized but not referenced 4189, # local variable is initialized but not referenced
4201, # (uv.h) nameless struct/union 4201, # (uv.h) nameless struct/union
4800, # (v8.h) forcing value to bool 'true' or 'false' 4800, # (v8.h) forcing value to bool 'true' or 'false'
@ -211,21 +211,20 @@
'msvs_settings': { 'msvs_settings': {
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'<(windows_driver_kit_path)/lib/ATL/i386', 'external_binaries/atl/lib',
], ],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'<(windows_driver_kit_path)/lib/ATL/i386', 'external_binaries/atl/lib',
], ],
'AdditionalDependencies': [ 'AdditionalDependencies': [
'atlthunk.lib', 'atls.lib',
], ],
}, },
}, },
'msvs_system_include_dirs': [ 'msvs_system_include_dirs': [
'<(windows_driver_kit_path)/inc/atl71', 'external_binaries/atl/include',
'<(windows_driver_kit_path)/inc/mfc42',
], ],
}, },
}], # msvs_express==1 }], # msvs_express==1