Chromium Code Reviews| Index: gyp/tools.gyp |
| =================================================================== |
| --- gyp/tools.gyp (revision 8016) |
| +++ gyp/tools.gyp (working copy) |
| @@ -184,6 +184,41 @@ |
| 'ports.gyp:ports', |
| 'tools.gyp:picture_utils', |
| ], |
| + 'conditions': [ |
| + ['skia_win_debuggers_path and skia_os == "win"', |
| + { |
| + 'dependencies': [ |
| + 'tools.gyp:win_dbghelp', |
| + ], |
| + }, |
| + ], |
| + # VS static libraries don't have a linker option. We must set a global |
| + # project linker option, or add it to each executable. |
| + ['skia_win_debuggers_path and skia_os == "win" and ' |
| + 'skia_arch_width == 64', |
|
borenet
2013/03/08 16:59:52
Sorry for continuing to nitpick... can we make thi
edisonn
2013/03/08 17:05:39
but it is a 4 space indent, I think it should be c
borenet
2013/03/08 17:11:21
I disagree. To me, the proper alignment for a sec
edisonn
2013/03/08 17:13:12
done; yeah, look better like this
On 2013/03/08 17
|
| + { |
| + 'msvs_settings': { |
| + 'VCLinkerTool': { |
| + 'AdditionalDependencies': [ |
| + '<(skia_win_debuggers_path)/x64/DbgHelp.lib', |
| + ], |
| + }, |
| + }, |
| + }, |
| + ], |
| + ['skia_win_debuggers_path and skia_os == "win" and ' |
| + 'skia_arch_width == 32', |
|
borenet
2013/03/08 16:59:52
Same here.
edisonn
2013/03/08 17:05:39
same
|
| + { |
| + 'msvs_settings': { |
| + 'VCLinkerTool': { |
| + 'AdditionalDependencies': [ |
| + '<(skia_win_debuggers_path)/DbgHelp.lib', |
| + ], |
| + }, |
| + }, |
| + }, |
| + ], |
| + ], |
| }, |
| { |
| 'target_name': 'picture_utils', |
| @@ -233,6 +268,17 @@ |
| 'tools.gyp:picture_utils', |
| ], |
| }, |
| + { |
| + 'target_name': 'win_dbghelp', |
| + 'type': 'static_library', |
| + 'defines': [ |
| + 'SK_CDB_PATH="<(skia_win_debuggers_path)"', |
| + ], |
| + 'sources': [ |
| + '../tools/win_dbghelp.h', |
| + '../tools/win_dbghelp.cpp', |
| + ], |
| + }, |
| ], |
| } |