From d3efa3ed9f5955bbb5924ce6beeeeb9c082d0b22 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Wed, 2 Feb 2011 01:19:53 +0000 Subject: A bit of Windows makefiles rework and cleanup: - Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... svn path=/trunk/; revision=35747 --- plugins/irda/Makefile.nmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/irda/Makefile.nmake') diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index d02da2ad4f..46034a0448 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -9,8 +9,9 @@ include moduleinfo.nmake include Makefile.common -CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) +CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ + /I../.. $(GLIB_CFLAGS) \ + /I$(PCAP_DIR)\include .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< -- cgit v1.2.1