| OLD | NEW |
| 1 # GYP file to build various tools. | 1 # GYP file to build various tools. |
| 2 # | 2 # |
| 3 # To build on Linux: | 3 # To build on Linux: |
| 4 # ./gyp_skia tools.gyp && make tools | 4 # ./gyp_skia tools.gyp && make tools |
| 5 # | 5 # |
| 6 # Building on other platforms not tested yet. | 6 # Building on other platforms not tested yet. |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'includes': [ | 9 'includes': [ |
| 10 'apptype_console.gypi', | 10 'apptype_console.gypi', |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 ], | 178 ], |
| 179 'dependencies': [ | 179 'dependencies': [ |
| 180 'core.gyp:core', | 180 'core.gyp:core', |
| 181 'effects.gyp:effects', | 181 'effects.gyp:effects', |
| 182 'images.gyp:images', | 182 'images.gyp:images', |
| 183 'pdf.gyp:pdf', | 183 'pdf.gyp:pdf', |
| 184 'ports.gyp:ports', | 184 'ports.gyp:ports', |
| 185 'tools.gyp:picture_utils', | 185 'tools.gyp:picture_utils', |
| 186 ], | 186 ], |
| 187 'conditions': [ | 187 'conditions': [ |
| 188 ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"'
, | 188 ['skia_win_debuggers_path and skia_os == "win"', |
| 189 { | 189 { |
| 190 'dependencies': [ | 190 'dependencies': [ |
| 191 'tools.gyp:win_dbghelp', | 191 'tools.gyp:win_dbghelp', |
| 192 ], | 192 ], |
| 193 }, | 193 }, |
| 194 ], | 194 ], |
| 195 # VS static libraries don't have a linker option. We must set a global | 195 # VS static libraries don't have a linker option. We must set a global |
| 196 # project linker option, or add it to each executable. | 196 # project linker option, or add it to each executable. |
| 197 ['skia_win_debuggers_path and skia_os == "win" and ' | 197 ['skia_win_debuggers_path and skia_os == "win" and ' |
| 198 'skia_arch_width == 64 and skia_os == "disable"', | 198 'skia_arch_width == 64', |
| 199 { | 199 { |
| 200 'msvs_settings': { | 200 'msvs_settings': { |
| 201 'VCLinkerTool': { | 201 'VCLinkerTool': { |
| 202 'AdditionalDependencies': [ | 202 'AdditionalDependencies': [ |
| 203 '<(skia_win_debuggers_path)/x64/DbgHelp.lib', | 203 '<(skia_win_debuggers_path)/x64/DbgHelp.lib', |
| 204 ], | 204 ], |
| 205 }, | 205 }, |
| 206 }, | 206 }, |
| 207 }, | 207 }, |
| 208 ], | 208 ], |
| 209 ['skia_win_debuggers_path and skia_os == "win" and ' | 209 ['skia_win_debuggers_path and skia_os == "win" and ' |
| 210 'skia_arch_width == 32 and skia_os == "disable"', | 210 'skia_arch_width == 32', |
| 211 { | 211 { |
| 212 'msvs_settings': { | 212 'msvs_settings': { |
| 213 'VCLinkerTool': { | 213 'VCLinkerTool': { |
| 214 'AdditionalDependencies': [ | 214 'AdditionalDependencies': [ |
| 215 '<(skia_win_debuggers_path)/DbgHelp.lib', | 215 '<(skia_win_debuggers_path)/DbgHelp.lib', |
| 216 ], | 216 ], |
| 217 }, | 217 }, |
| 218 }, | 218 }, |
| 219 }, | 219 }, |
| 220 ], | 220 ], |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 ], | 263 ], |
| 264 'dependencies': [ | 264 'dependencies': [ |
| 265 'skia_base_libs.gyp:skia_base_libs', | 265 'skia_base_libs.gyp:skia_base_libs', |
| 266 'effects.gyp:effects', | 266 'effects.gyp:effects', |
| 267 'images.gyp:images', | 267 'images.gyp:images', |
| 268 'tools.gyp:picture_utils', | 268 'tools.gyp:picture_utils', |
| 269 ], | 269 ], |
| 270 }, | 270 }, |
| 271 ], | 271 ], |
| 272 'conditions': [ | 272 'conditions': [ |
| 273 ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', | 273 ['skia_win_debuggers_path and skia_os == "win"', |
| 274 { | 274 { |
| 275 'targets': [ | 275 'targets': [ |
| 276 { | 276 { |
| 277 'target_name': 'win_dbghelp', | 277 'target_name': 'win_dbghelp', |
| 278 'type': 'static_library', | 278 'type': 'static_library', |
| 279 'defines': [ | 279 'defines': [ |
| 280 'SK_CDB_PATH="<(skia_win_debuggers_path)"', | 280 'SK_CDB_PATH="<(skia_win_debuggers_path)"', |
| 281 ], | 281 ], |
| 282 'sources': [ | 282 'sources': [ |
| 283 '../tools/win_dbghelp.h', | 283 '../tools/win_dbghelp.h', |
| 284 '../tools/win_dbghelp.cpp', | 284 '../tools/win_dbghelp.cpp', |
| 285 ], | 285 ], |
| 286 }, | 286 }, |
| 287 ], | 287 ], |
| 288 }, | 288 }, |
| 289 ], | 289 ], |
| 290 ], | 290 ], |
| 291 } | 291 } |
| 292 | 292 |
| 293 # Local Variables: | 293 # Local Variables: |
| 294 # tab-width:2 | 294 # tab-width:2 |
| 295 # indent-tabs-mode:nil | 295 # indent-tabs-mode:nil |
| 296 # End: | 296 # End: |
| 297 # vim: set expandtab tabstop=2 shiftwidth=2: | 297 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |