Mercurial > hg > graal-compiler
changeset 12139:c26d57fa08aa
Merge
author | iklam |
---|---|
date | Tue, 27 Aug 2013 16:02:59 -0400 |
parents | 5351fe805c12 (current diff) 35471dcba316 (diff) |
children | 915cc4f3fb15 |
files | |
diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 **************************************************************
--- 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