56 PLATFORM_INCLUDE_NAME = win32 |
56 PLATFORM_INCLUDE_NAME = win32 |
57 PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) |
57 PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) |
58 |
58 |
59 # The following DLL's are considered MS runtime libraries and should |
59 # The following DLL's are considered MS runtime libraries and should |
60 # not to be REBASEd, see deploy/make/common/Release.gmk. |
60 # not to be REBASEd, see deploy/make/common/Release.gmk. |
61 # msvcrt.dll, msvcr71.dll: Microsoft runtimes |
61 # msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes |
62 MS_RUNTIME_LIBRARIES = msvcrt.dll |
62 MS_RUNTIME_LIBRARIES = msvcrt.dll |
|
63 MSVCRNN_DLL = |
63 ifeq ($(ARCH_DATA_MODEL), 32) |
64 ifeq ($(ARCH_DATA_MODEL), 32) |
64 ifeq ($(COMPILER_VERSION), VS2003) |
65 ifeq ($(COMPILER_VERSION), VS2003) |
65 MS_RUNTIME_LIBRARIES += msvcr71.dll |
66 MSVCRNN_DLL = msvcr71.dll |
|
67 MSVCPNN_DLL = msvcp71.dll |
|
68 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) |
|
69 endif |
|
70 ifeq ($(COMPILER_VERSION), VS2005) |
|
71 MSVCRNN_DLL = msvcr80.dll |
|
72 MSVCPNN_DLL = msvcp80.dll |
|
73 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) |
|
74 endif |
|
75 ifeq ($(COMPILER_VERSION), VS2008) |
|
76 MSVCRNN_DLL = msvcr90.dll |
|
77 MSVCPNN_DLL = msvcp90.dll |
|
78 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) |
66 endif |
79 endif |
67 endif |
80 endif |
68 |
81 |
69 # C Compiler flag definitions |
82 # C Compiler flag definitions |
70 |
83 |
177 # -MDd Use debug version (don't use, doesn't mix with -MD DLL's) |
204 # -MDd Use debug version (don't use, doesn't mix with -MD DLL's) |
178 # -MT Use static multi-threaded runtime library (-ML is going away) |
205 # -MT Use static multi-threaded runtime library (-ML is going away) |
179 # -MTd Use static debug version (better than -MDd, no runtime issues) |
206 # -MTd Use static debug version (better than -MDd, no runtime issues) |
180 # -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd) |
207 # -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd) |
181 # |
208 # |
182 # NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcp71.dll |
209 # NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll |
183 # |
210 # |
184 ifeq ($(MS_RUNTIME_STATIC),true) |
211 ifeq ($(MS_RUNTIME_STATIC),true) |
185 MS_RUNTIME_OPTION=-MT |
212 MS_RUNTIME_OPTION=-MT |
186 else |
213 else |
187 MS_RUNTIME_OPTION=-MD |
214 MS_RUNTIME_OPTION=-MD |
215 # -Zl Don't add runtime library name to obj file? |
242 # -Zl Don't add runtime library name to obj file? |
216 # -Od Turns off optimization and speeds compilation |
243 # -Od Turns off optimization and speeds compilation |
217 # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?) |
244 # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?) |
218 # -nologo Don't print out startup message |
245 # -nologo Don't print out startup message |
219 # /D _STATIC_CPPLIB |
246 # /D _STATIC_CPPLIB |
220 # Use static link for the C++ runtime (so msvcp71.dll not needed) |
247 # Use static link for the C++ runtime (so msvcpnn.dll not needed) |
221 # |
248 # |
222 CFLAGS_COMMON += -Zi -nologo |
249 CFLAGS_COMMON += -Zi -nologo |
223 CFLAGS_OPT = $(POPT) |
250 CFLAGS_OPT = $(POPT) |
224 CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION) |
251 CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION) |
225 |
252 |