make/common/Defs-windows.gmk

changeset 150
ee2d8f1bef5b
parent 88
ffb590b42ed1
child 158
91006f157c46
equal deleted inserted replaced
148:930582f667a1 150:ee2d8f1bef5b
73 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) 73 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
74 endif 74 endif
75 ifeq ($(COMPILER_VERSION), VS2008) 75 ifeq ($(COMPILER_VERSION), VS2008)
76 MSVCRNN_DLL = msvcr90.dll 76 MSVCRNN_DLL = msvcr90.dll
77 MSVCPNN_DLL = msvcp90.dll 77 MSVCPNN_DLL = msvcp90.dll
78 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
79 endif
80 ifeq ($(COMPILER_VERSION), VS2010)
81 MSVCRNN_DLL = msvcr100.dll
82 MSVCPNN_DLL = msvcp100.dll
78 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL) 83 MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
79 endif 84 endif
80 endif 85 endif
81 86
82 # C Compiler flag definitions 87 # C Compiler flag definitions
173 CC_HIGHEST_OPT = -O2 178 CC_HIGHEST_OPT = -O2
174 CC_HIGHER_OPT = -O1 179 CC_HIGHER_OPT = -O1
175 CC_LOWER_OPT = -O1 180 CC_LOWER_OPT = -O1
176 endif 181 endif
177 endif 182 endif
183 ifeq ($(COMPILER_VERSION), VS2010)
184 # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
185 AUTOMATIC_PCH_OPTION =
186 GX_OPTION = -EHsc
187 ifeq ($(ARCH_DATA_MODEL), 32)
188 CC_HIGHEST_OPT = -O2
189 CC_HIGHER_OPT = -O1
190 CC_LOWER_OPT = -O1
191 else
192 CC_HIGHEST_OPT = -O2
193 CC_HIGHER_OPT = -O1
194 CC_LOWER_OPT = -O1
195 endif
196 endif
178 CC_NO_OPT = -Od 197 CC_NO_OPT = -Od
179 else # CC_VERSION 198 else # CC_VERSION
180 # GCC not supported, but left for historical reference... 199 # GCC not supported, but left for historical reference...
181 CC_HIGHEST_OPT = -O3 200 CC_HIGHEST_OPT = -O3
182 CC_HIGHER_OPT = -O2 201 CC_HIGHER_OPT = -O2

mercurial