Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Unified Diff: gyp/tools.gyp

Issue 12421010: Try to fix Windows build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/win_dbghelp.cpp » ('j') | tools/win_dbghelp.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/tools.gyp
===================================================================
--- gyp/tools.gyp (revision 8057)
+++ gyp/tools.gyp (working copy)
@@ -185,7 +185,7 @@
'tools.gyp:picture_utils',
],
'conditions': [
- ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"',
+ ['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 and skia_os == "disable"',
+ 'skia_arch_width == 64',
{
'msvs_settings': {
'VCLinkerTool': {
@@ -207,7 +207,7 @@
},
],
['skia_win_debuggers_path and skia_os == "win" and '
- 'skia_arch_width == 32 and skia_os == "disable"',
+ 'skia_arch_width == 32',
{
'msvs_settings': {
'VCLinkerTool': {
@@ -270,7 +270,7 @@
},
],
'conditions': [
- ['skia_os == "disable" and skia_win_debuggers_path and skia_os == "win"',
+ ['skia_win_debuggers_path and skia_os == "win"',
{
'targets': [
{
« no previous file with comments | « no previous file | tools/win_dbghelp.cpp » ('j') | tools/win_dbghelp.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698