Mercurial > hg > truffle
diff make/windows/makefiles/compile.make @ 1485:fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
6951582: Build problems on win64
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
| author | prr |
|---|---|
| date | Tue, 11 May 2010 14:35:43 -0700 |
| parents | bd02caa94611 |
| children | c18cbe5936b8 |
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make Tue May 04 12:25:39 2010 -0700 +++ b/make/windows/makefiles/compile.make Tue May 11 14:35:43 2010 -0700 @@ -92,6 +92,7 @@ # 1399 is our fake number for the VS2005 compiler that really isn't 1400 # 1400 is for VS2005 # 1500 is for VS2008 +# 1600 is for VS2010 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. # Normally they are the same, but a pre-release of the VS2005 compilers @@ -121,6 +122,9 @@ !if "$(MSC_VER)" == "1500" COMPILER_NAME=VS2008 !endif +!if "$(MSC_VER)" == "1600" +COMPILER_NAME=VS2010 +!endif !endif # Add what version of the compiler we think this is to the compile line @@ -183,6 +187,17 @@ MT=mt.exe !endif +!if "$(COMPILER_NAME)" == "VS2010" +PRODUCT_OPT_OPTION = /O2 /Oy- +FASTDEBUG_OPT_OPTION = /O2 /Oy- +DEBUG_OPT_OPTION = /Od +GX_OPTION = /EHsc +LINK_FLAGS = /manifest $(LINK_FLAGS) +# Manifest Tool - used in VS2005 and later to adjust manifests stored +# as resources inside build artifacts. +MT=mt.exe +!endif + # Compile for space above time. !if "$(Variant)" == "kernel" PRODUCT_OPT_OPTION = /O1 /Oy-