Make make.bat and gyp_skia work with VS 2012.

make.bat

Index: make.bat
diff --git a/make.bat b/make.bat
index fbe0a352f1c52c418c6fc27bdccc38e6da61a83f..a9961074e347cdcc4abb42cfeb0559b234ee7cc0 100644
--- a/make.bat
+++ b/make.bat
@@ -2,25 +2,31 @@
 @rem
 @rem    Use of this source code is governed by a BSD-style license that can be
 @rem    found in the LICENSE file.
+@ECHO OFF
 
-@rem Launches make.py on Windows, after setting Visual Studio environment variables.
-@rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows
+rem Launches make.py on Windows, after setting Visual Studio environment variables.
+rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows
 
-@if "%DevEnvDir%"=="" goto setup_env_vars
+if "%DevEnvDir%"=="" goto setup_env_vars
 
 :run_python
-@rem Run make.py and propagate its return value.
+rem Run make.py and propagate its return value.
 python make.py %*
-@exit /B %ERRORLEVEL%
+exit /B %ERRORLEVEL%
 
 :setup_env_vars
-@rem Visual Studio environment variables aren't set yet, so run vcvars32.bat
-@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLS
-call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat"
-@if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%
-@goto run_python
+rem Visual Studio environment variables aren't set yet, so run vcvars32.bat
+if DEFINED VS110COMNTOOLS (
+    call "%VS110COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+) else if DEFINED VS100COMNTOOLS (
+    call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+) else (
+    goto error_no_VS
+)
+if %ERRORLEVEL% neq 0 exit /B %ERRORLEVEL%
+goto run_python
 
-:error_no_VS100COMNTOOLS
-@echo ERROR: VS100COMNTOOLS environment variable not set.
-@echo Are you sure Visual Studio 2010 is installed?
-@exit /B 1
+:error_no_VS
+echo ERROR: Neither VS100COMNTOOLS nor VS110COMNTOOLS environment variable is set.
+echo Are you sure Visual Studio 2010 or 2012 is installed?
+exit /B 1