1.1 --- a/make/windows/makefiles/compile.make Tue May 04 12:25:39 2010 -0700
1.2 +++ b/make/windows/makefiles/compile.make Tue May 11 14:35:43 2010 -0700
1.3 @@ -92,6 +92,7 @@
1.4 # 1399 is our fake number for the VS2005 compiler that really isn't 1400
1.5 # 1400 is for VS2005
1.6 # 1500 is for VS2008
1.7 +# 1600 is for VS2010
1.8 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the
1.9 # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400.
1.10 # Normally they are the same, but a pre-release of the VS2005 compilers
1.11 @@ -121,6 +122,9 @@
1.12 !if "$(MSC_VER)" == "1500"
1.13 COMPILER_NAME=VS2008
1.14 !endif
1.15 +!if "$(MSC_VER)" == "1600"
1.16 +COMPILER_NAME=VS2010
1.17 +!endif
1.18 !endif
1.19
1.20 # Add what version of the compiler we think this is to the compile line
1.21 @@ -183,6 +187,17 @@
1.22 MT=mt.exe
1.23 !endif
1.24
1.25 +!if "$(COMPILER_NAME)" == "VS2010"
1.26 +PRODUCT_OPT_OPTION = /O2 /Oy-
1.27 +FASTDEBUG_OPT_OPTION = /O2 /Oy-
1.28 +DEBUG_OPT_OPTION = /Od
1.29 +GX_OPTION = /EHsc
1.30 +LINK_FLAGS = /manifest $(LINK_FLAGS)
1.31 +# Manifest Tool - used in VS2005 and later to adjust manifests stored
1.32 +# as resources inside build artifacts.
1.33 +MT=mt.exe
1.34 +!endif
1.35 +
1.36 # Compile for space above time.
1.37 !if "$(Variant)" == "kernel"
1.38 PRODUCT_OPT_OPTION = /O1 /Oy-
