1.1 --- a/make/common/Defs-windows.gmk Thu Apr 29 14:32:40 2010 -0700
1.2 +++ b/make/common/Defs-windows.gmk Tue May 11 14:35:21 2010 -0700
1.3 @@ -77,6 +77,11 @@
1.4 MSVCPNN_DLL = msvcp90.dll
1.5 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
1.6 endif
1.7 + ifeq ($(COMPILER_VERSION), VS2010)
1.8 + MSVCRNN_DLL = msvcr100.dll
1.9 + MSVCPNN_DLL = msvcp100.dll
1.10 + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
1.11 + endif
1.12 endif
1.13
1.14 # C Compiler flag definitions
1.15 @@ -175,6 +180,20 @@
1.16 CC_LOWER_OPT = -O1
1.17 endif
1.18 endif
1.19 + ifeq ($(COMPILER_VERSION), VS2010)
1.20 + # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
1.21 + AUTOMATIC_PCH_OPTION =
1.22 + GX_OPTION = -EHsc
1.23 + ifeq ($(ARCH_DATA_MODEL), 32)
1.24 + CC_HIGHEST_OPT = -O2
1.25 + CC_HIGHER_OPT = -O1
1.26 + CC_LOWER_OPT = -O1
1.27 + else
1.28 + CC_HIGHEST_OPT = -O2
1.29 + CC_HIGHER_OPT = -O1
1.30 + CC_LOWER_OPT = -O1
1.31 + endif
1.32 + endif
1.33 CC_NO_OPT = -Od
1.34 else # CC_VERSION
1.35 # GCC not supported, but left for historical reference...
