diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-02-02 01:19:53 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-02-02 01:19:53 +0000 |
| commit | d3efa3ed9f5955bbb5924ce6beeeeb9c082d0b22 (patch) | |
| tree | 5d9b2fd59c1e3d5a929f07797195a7b93b88c549 /epan/dissectors/Makefile.nmake | |
| parent | fa5efc04e307dfbef2f991d2a9965707cb74d7a8 (diff) | |
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
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 7ca1b1cd9e..598b44898b 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -11,13 +11,12 @@ include Custom.nmake include Makefile.common -CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \ +CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ + /I. /I.. /I../.. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) \ $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \ $(KFW_CFLAGS) $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \ - /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) - -CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL + /I$(PCAP_DIR)\include .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< @@ -32,7 +31,12 @@ dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../co @echo Linking dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) -!IF "$(MSVC_VARIANT)" != "MSVC2005EE" && "$(MSVC_VARIANT)" != "MSVC2005" && "$(MSVC_VARIANT)" != "MSVC2008EE" && "$(MSVC_VARIANT)" != "MSVC2008" +!IF "$(MSVC_VARIANT)" != "MSVC2005" && \ + "$(MSVC_VARIANT)" != "MSVC2005EE" && \ + "$(MSVC_VARIANT)" != "MSVC2008" && \ + "$(MSVC_VARIANT)" != "MSVC2008EE" && \ + "$(MSVC_VARIANT)" != "MSVC2010" && \ + "$(MSVC_VARIANT)" != "MSVC2010EE" # Disable debug for large dissectors packet-rrc.obj : packet-rrc.c $(CC) $(CVARSDLL) $(CFLAGS) /Zd /Fd.\ -c $? |