1.1 --- a/make/common/Defs-windows.gmk Thu Oct 02 19:58:15 2008 -0700
1.2 +++ b/make/common/Defs-windows.gmk Wed Oct 15 21:24:26 2008 -0700
1.3 @@ -58,11 +58,24 @@
1.4
1.5 # The following DLL's are considered MS runtime libraries and should
1.6 # not to be REBASEd, see deploy/make/common/Release.gmk.
1.7 -# msvcrt.dll, msvcr71.dll: Microsoft runtimes
1.8 +# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
1.9 MS_RUNTIME_LIBRARIES = msvcrt.dll
1.10 +MSVCRNN_DLL =
1.11 ifeq ($(ARCH_DATA_MODEL), 32)
1.12 ifeq ($(COMPILER_VERSION), VS2003)
1.13 - MS_RUNTIME_LIBRARIES += msvcr71.dll
1.14 + MSVCRNN_DLL = msvcr71.dll
1.15 + MSVCPNN_DLL = msvcp71.dll
1.16 + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
1.17 + endif
1.18 + ifeq ($(COMPILER_VERSION), VS2005)
1.19 + MSVCRNN_DLL = msvcr80.dll
1.20 + MSVCPNN_DLL = msvcp80.dll
1.21 + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
1.22 + endif
1.23 + ifeq ($(COMPILER_VERSION), VS2008)
1.24 + MSVCRNN_DLL = msvcr90.dll
1.25 + MSVCPNN_DLL = msvcp90.dll
1.26 + MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
1.27 endif
1.28 endif
1.29
1.30 @@ -148,6 +161,20 @@
1.31 CC_LOWER_OPT = -O1
1.32 endif
1.33 endif
1.34 + ifeq ($(COMPILER_VERSION), VS2008)
1.35 + # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
1.36 + AUTOMATIC_PCH_OPTION =
1.37 + GX_OPTION = -EHsc
1.38 + ifeq ($(ARCH_DATA_MODEL), 32)
1.39 + CC_HIGHEST_OPT = -O2
1.40 + CC_HIGHER_OPT = -O1
1.41 + CC_LOWER_OPT = -O1
1.42 + else
1.43 + CC_HIGHEST_OPT = -O2
1.44 + CC_HIGHER_OPT = -O1
1.45 + CC_LOWER_OPT = -O1
1.46 + endif
1.47 + endif
1.48 CC_NO_OPT = -Od
1.49 else # CC_VERSION
1.50 # GCC not supported, but left for historical reference...
1.51 @@ -179,7 +206,7 @@
1.52 # -MTd Use static debug version (better than -MDd, no runtime issues)
1.53 # -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd)
1.54 #
1.55 -# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcp71.dll
1.56 +# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll
1.57 #
1.58 ifeq ($(MS_RUNTIME_STATIC),true)
1.59 MS_RUNTIME_OPTION=-MT
1.60 @@ -217,7 +244,7 @@
1.61 # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?)
1.62 # -nologo Don't print out startup message
1.63 # /D _STATIC_CPPLIB
1.64 - # Use static link for the C++ runtime (so msvcp71.dll not needed)
1.65 + # Use static link for the C++ runtime (so msvcpnn.dll not needed)
1.66 #
1.67 CFLAGS_COMMON += -Zi -nologo
1.68 CFLAGS_OPT = $(POPT)
