# HG changeset patch
# User iklam
# Date 1377633779 14400
# Node ID c26d57fa08aa4bc5df01a37963e659cb3b867cfc
# Parent  5351fe805c127f4ce4c4a810da4ff1287ad7b951# Parent  35471dcba3164c7dee82b640994e8a5d9001d7ff
Merge

diff -r 5351fe805c12 -r c26d57fa08aa make/windows/create.bat
--- a/make/windows/create.bat	Tue Aug 27 07:54:05 2013 -0700
+++ b/make/windows/create.bat	Tue Aug 27 16:02:59 2013 -0400
@@ -82,6 +82,7 @@
 
 echo **************************************************************
 set ProjectFile=%HotSpotBuildSpace%\jvm.vcproj
+echo MSC_VER = "%MSC_VER%" 
 if "%MSC_VER%" == "1200" (
 set ProjectFile=%HotSpotBuildSpace%\jvm.dsp
 echo Will generate VC6 project {unsupported}
@@ -96,11 +97,17 @@
 echo Will generate VC10 {Visual Studio 2010}
 set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj
 ) else (
+if "%MSC_VER%" == "1700" (
+echo Will generate VC10 {compatible with Visual Studio 2012}
+echo After opening in VS 2012, click "Update" when prompted.
+set ProjectFile=%HotSpotBuildSpace%\jvm.vcxproj
+) else (
 echo Will generate VC7 project {Visual Studio 2003 .NET}
 )
 )
 )
 )
+)
 echo %ProjectFile%
 echo **************************************************************
 
diff -r 5351fe805c12 -r c26d57fa08aa make/windows/makefiles/rules.make
--- a/make/windows/makefiles/rules.make	Tue Aug 27 07:54:05 2013 -0700
+++ b/make/windows/makefiles/rules.make	Tue Aug 27 16:02:59 2013 -0400
@@ -69,6 +69,13 @@
 VcVersion=VC10
 ProjectFile=jvm.vcxproj
 
+!elseif "$(MSC_VER)" == "1700"
+# This is VS2012, but it loads VS10 projects just fine (and will
+# upgrade them automatically to VS2012 format).
+
+VcVersion=VC10
+ProjectFile=jvm.vcxproj
+
 !else
 
 VcVersion=VC7