comparison make/common/Defs-windows.gmk @ 422:c51121419e30

6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles Reviewed-by: tbell
author ohair
date Sun, 27 Jul 2008 18:42:57 -0700
parents 89d30b258517
children a418b563ed63
comparison
equal deleted inserted replaced
3:c2bbc757bd5a 4:1c7198518aee
281 # 281 #
282 CPPFLAGS_COMMON = -DWIN32 -DIAL -D_LITTLE_ENDIAN 282 CPPFLAGS_COMMON = -DWIN32 -DIAL -D_LITTLE_ENDIAN
283 ifeq ($(ARCH), amd64) 283 ifeq ($(ARCH), amd64)
284 CPPFLAGS_COMMON += -D_AMD64_ -Damd64 284 CPPFLAGS_COMMON += -D_AMD64_ -Damd64
285 else 285 else
286 CPPFLAGS_COMMON += -DWIN32 -D_X86_ -Dx86 286 CPPFLAGS_COMMON += -D_X86_ -Dx86
287 endif 287 endif
288 CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN 288 CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
289 289
290 # 290 #
291 # Output options (use specific filenames to avoid parallel compile errors) 291 # Output options (use specific filenames to avoid parallel compile errors)
292 # 292 #
293 CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map 293 CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
294
295 #
296 # Use -wdNNNN to disable warning NNNN.
297 # C4800 is a warning about bool performance casts (can't make go away)
298 #
299 COMPILER_WARNINGS_TO_IGNORE = 4800
300 CFLAGS_COMMON += $(COMPILER_WARNINGS_TO_IGNORE:%=-wd%)
294 301
295 # 302 #
296 # Add warnings and extra on 64bit issues 303 # Add warnings and extra on 64bit issues
297 # 304 #
298 ifeq ($(ARCH_DATA_MODEL), 64) 305 ifeq ($(ARCH_DATA_MODEL), 64)
299 CFLAGS_COMMON += -Wp64 306 CFLAGS_COMMON += -Wp64
300 endif 307 endif
308
309 #
310 # Treat compiler warnings as errors, if requested
311 #
301 CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL) 312 CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
302
303 #
304 # Treat compiler warnings as errors, if requested
305 #
306 ifeq ($(COMPILER_WARNINGS_FATAL),true) 313 ifeq ($(COMPILER_WARNINGS_FATAL),true)
307 CFLAGS_COMMON += -WX 314 CFLAGS_COMMON += -WX
308 endif 315 endif
309 316
310 CPPFLAGS_OPT = 317 CPPFLAGS_OPT =
350 # and these will be changed to true. Until then, 357 # and these will be changed to true. Until then,
351 # to build SA on windows, do a control build with 358 # to build SA on windows, do a control build with
352 # BUILD_WIN_SA=1 359 # BUILD_WIN_SA=1
353 # on the make command. 360 # on the make command.
354 ifdef BUILD_WIN_SA 361 ifdef BUILD_WIN_SA
355 ifeq ($(ARCH), amd64) 362 INCLUDE_SA = true
356 INCLUDE_SA = true
357 else
358 INCLUDE_SA = true
359 endif
360 else 363 else
361 ifeq ($(ARCH), amd64) 364 INCLUDE_SA = false
362 INCLUDE_SA = false
363 else
364 INCLUDE_SA = false
365 endif
366 endif 365 endif
367 endif 366 endif
368 367
369 # Settings for the VERSIONINFO tap on windows. 368 # Settings for the VERSIONINFO tap on windows.
370 VERSIONINFO_RESOURCE = $(BUILDDIR)/../src/windows/resource/version.rc 369 VERSIONINFO_RESOURCE = $(BUILDDIR)/../src/windows/resource/version.rc