diff options
| -rw-r--r-- | gyp/tools.gyp | 8 | ||||
| -rw-r--r-- | tools/win_dbghelp.cpp | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 63ef2587cf..4e3bc5361b 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -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': [ { diff --git a/tools/win_dbghelp.cpp b/tools/win_dbghelp.cpp index cd215ff89b..4102399a4f 100644 --- a/tools/win_dbghelp.cpp +++ b/tools/win_dbghelp.cpp @@ -5,8 +5,6 @@ * found in the LICENSE file. */ -#ifdef SK_BUILD_FOR_WIN32 - #include "windows.h" #include "win_dbghelp.h" #include <process.h> @@ -206,7 +204,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { void setUpDebuggingFromArgs(const char* vargs0) { int i = strlen(vargs0); - if (i >= 4 && stricmp(vargs0 - 4, ".exe") == 0) { + if (i >= 4 && _stricmp(vargs0 - 4, ".exe") == 0) { // Ignore .exe i -= 4; } @@ -244,4 +242,3 @@ void setUpDebuggingFromArgs(const char* vargs0) { setCdbPath(cdbExePath); } -#endif // SK_BUILD_FOR_WIN32 |