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

win: Use absolute path for ATL.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-08 15:45:24 +08:00
parent 0f5d929c09
commit 336908eba0
2 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
atom.gyp
View file

@ -800,5 +800,31 @@
}, # target generate_node_lib }, # target generate_node_lib
], ],
}], # OS==win }], # OS==win
# Using Visual Studio Express.
['msvs_express==1', {
'target_defaults': {
'defines!': [
'_SECURE_ATL',
],
'msvs_settings': {
'VCLibrarianTool': {
'AdditionalLibraryDirectories': [
'<(atom_source_root)/external_binaries/atl/lib',
],
},
'VCLinkerTool': {
'AdditionalLibraryDirectories': [
'<(atom_source_root)/external_binaries/atl/lib',
],
'AdditionalDependencies': [
'atls.lib',
],
},
},
'msvs_system_include_dirs': [
'<(atom_source_root)/external_binaries/atl/include',
],
},
}], # msvs_express==1
], ],
} }

27
common.gypi
View file

@ -134,7 +134,6 @@
'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'
@ -202,32 +201,6 @@
}, },
}, },
}], # clang==1 }], # clang==1
# Using Visual Studio Express.
['msvs_express==1', {
'target_defaults': {
'defines!': [
'_SECURE_ATL',
],
'msvs_settings': {
'VCLibrarianTool': {
'AdditionalLibraryDirectories': [
'external_binaries/atl/lib',
],
},
'VCLinkerTool': {
'AdditionalLibraryDirectories': [
'external_binaries/atl/lib',
],
'AdditionalDependencies': [
'atls.lib',
],
},
},
'msvs_system_include_dirs': [
'external_binaries/atl/include',
],
},
}], # msvs_express==1
# The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations. # The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
['OS=="win"', { ['OS=="win"', {
'target_defaults': { 'target_defaults': {