equal
deleted
inserted
replaced
42 # /Gy Func level link (in /O1, allows for link-time func ordering) |
42 # /Gy Func level link (in /O1, allows for link-time func ordering) |
43 # /Gs Inserts stack probes (in /O1) |
43 # /Gs Inserts stack probes (in /O1) |
44 # /GS Inserts security stack checks in some functions (VS2005 default) |
44 # /GS Inserts security stack checks in some functions (VS2005 default) |
45 # /Oi Use intrinsics (in /O2) |
45 # /Oi Use intrinsics (in /O2) |
46 # /Od Disable all optimizations |
46 # /Od Disable all optimizations |
|
47 # /MP Use multiple cores for compilation |
47 # |
48 # |
48 # NOTE: Normally following any of the above with a '-' will turn off that flag |
49 # NOTE: Normally following any of the above with a '-' will turn off that flag |
49 # |
50 # |
50 # 6655385: For VS2003/2005 we now specify /Oy- (disable frame pointer |
51 # 6655385: For VS2003/2005 we now specify /Oy- (disable frame pointer |
51 # omission.) This has little to no effect on performance while vastly |
52 # omission.) This has little to no effect on performance while vastly |
204 PRODUCT_OPT_OPTION = /O2 /Oy- |
205 PRODUCT_OPT_OPTION = /O2 /Oy- |
205 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
206 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
206 DEBUG_OPT_OPTION = /Od |
207 DEBUG_OPT_OPTION = /Od |
207 GX_OPTION = /EHsc |
208 GX_OPTION = /EHsc |
208 LD_FLAGS = /manifest $(LD_FLAGS) |
209 LD_FLAGS = /manifest $(LD_FLAGS) |
|
210 MP_FLAG = /MP |
209 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
211 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
210 # as resources inside build artifacts. |
212 # as resources inside build artifacts. |
211 !if "x$(MT)" == "x" |
213 !if "x$(MT)" == "x" |
212 MT=mt.exe |
214 MT=mt.exe |
213 !endif |
215 !endif |
217 PRODUCT_OPT_OPTION = /O2 /Oy- |
219 PRODUCT_OPT_OPTION = /O2 /Oy- |
218 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
220 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
219 DEBUG_OPT_OPTION = /Od |
221 DEBUG_OPT_OPTION = /Od |
220 GX_OPTION = /EHsc |
222 GX_OPTION = /EHsc |
221 LD_FLAGS = /manifest $(LD_FLAGS) |
223 LD_FLAGS = /manifest $(LD_FLAGS) |
|
224 MP_FLAG = /MP |
222 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
225 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
223 # as resources inside build artifacts. |
226 # as resources inside build artifacts. |
224 !if "x$(MT)" == "x" |
227 !if "x$(MT)" == "x" |
225 MT=mt.exe |
228 MT=mt.exe |
226 !endif |
229 !endif |
233 PRODUCT_OPT_OPTION = /O2 /Oy- |
236 PRODUCT_OPT_OPTION = /O2 /Oy- |
234 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
237 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
235 DEBUG_OPT_OPTION = /Od |
238 DEBUG_OPT_OPTION = /Od |
236 GX_OPTION = /EHsc |
239 GX_OPTION = /EHsc |
237 LD_FLAGS = /manifest $(LD_FLAGS) |
240 LD_FLAGS = /manifest $(LD_FLAGS) |
|
241 MP_FLAG = /MP |
238 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
242 # Manifest Tool - used in VS2005 and later to adjust manifests stored |
239 # as resources inside build artifacts. |
243 # as resources inside build artifacts. |
240 !if "x$(MT)" == "x" |
244 !if "x$(MT)" == "x" |
241 MT=mt.exe |
245 MT=mt.exe |
242 !endif |
246 !endif |
243 !if "$(BUILDARCH)" == "i486" |
247 !if "$(BUILDARCH)" == "i486" |
244 LD_FLAGS = /SAFESEH $(LD_FLAGS) |
248 LD_FLAGS = /SAFESEH $(LD_FLAGS) |
245 !endif |
249 !endif |
246 !endif |
250 !endif |
|
251 |
|
252 CXX_FLAGS = $(CXX_FLAGS) $(MP_FLAG) |
247 |
253 |
248 # If NO_OPTIMIZATIONS is defined in the environment, turn everything off |
254 # If NO_OPTIMIZATIONS is defined in the environment, turn everything off |
249 !ifdef NO_OPTIMIZATIONS |
255 !ifdef NO_OPTIMIZATIONS |
250 PRODUCT_OPT_OPTION = $(DEBUG_OPT_OPTION) |
256 PRODUCT_OPT_OPTION = $(DEBUG_OPT_OPTION) |
251 FASTDEBUG_OPT_OPTION = $(DEBUG_OPT_OPTION) |
257 FASTDEBUG_OPT_OPTION = $(DEBUG_OPT_OPTION) |