diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 22:22:44 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 22:22:44 +0000 |
| commit | 663a97912921f74c081d2b5184c151742cc00393 (patch) | |
| tree | ed1be13bb447d208c1c7faf80d804b017bcf72fd /gyp/tools.gyp | |
| parent | f8905e4d440b0b214d8a9bc393af2a509f4ddf13 (diff) | |
Fix build
Disable r8044 differently.
Unreviewed
git-svn-id: http://skia.googlecode.com/svn/trunk@8057 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/tools.gyp')
| -rw-r--r-- | gyp/tools.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 4e3bc5361b..63ef2587cf 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -185,7 +185,7 @@ 'tools.gyp:picture_utils', ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'dependencies': [ 'tools.gyp:win_dbghelp', @@ -195,7 +195,7 @@ # 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', + 'skia_arch_width == 64 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -207,7 +207,7 @@ }, ], ['skia_win_debuggers_path and skia_os == "win" and ' - 'skia_arch_width == 32', + 'skia_arch_width == 32 and skia_os == "disable"', { 'msvs_settings': { 'VCLinkerTool': { @@ -270,7 +270,7 @@ }, ], 'conditions': [ - ['skia_win_debuggers_path and skia_os == "win"', + ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"', { 'targets': [ { |