Index: gyp/tools.gyp |
=================================================================== |
--- gyp/tools.gyp (revision 8016) |
+++ gyp/tools.gyp (working copy) |
@@ -184,6 +184,38 @@ |
'ports.gyp:ports', |
'tools.gyp:picture_utils', |
], |
+ 'conditions': [ |
+ ['skia_win_debuggers_path != ""', |
borenet
2013/03/07 20:22:39
This expression can just be: 'skia_win_debuggers_p
edisonn
2013/03/07 20:43:42
Done.
|
+ { |
+ '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. |
epoger
2013/03/07 21:09:09
please line-wrap that rascal
edisonn
2013/03/08 15:50:57
Done.
|
+ ['skia_win_debuggers_path != "" and skia_os == "win" and skia_arch_width == 64', |
+ { |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'AdditionalDependencies': [ |
+ '<(skia_win_debuggers_path)/x64/DbgHelp.lib', |
+ ], |
+ }, |
+ }, |
+ }, |
+ ], |
+ ['skia_win_debuggers_path != "" and skia_os == "win" and skia_arch_width == 32', |
+ { |
+ 'msvs_settings': { |
+ 'VCLinkerTool': { |
+ 'AdditionalDependencies': [ |
+ '<(skia_win_debuggers_path)/DbgHelp.lib', |
+ ], |
+ }, |
+ }, |
+ }, |
+ ], |
+ ], |
}, |
{ |
'target_name': 'picture_utils', |
@@ -233,6 +265,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', |
+ ], |
+ }, |
], |
} |