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/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/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index c1d69fb2c9..3cfa7ecda7 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -12,13 +12,14 @@ include Makefile.common LINK= link # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ +GENERATED_CFLAGS=\ + $(STANDARD_CFLAGS) \ + /I. /I.. /I../wiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \ $(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ - $(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" $(LOCAL_CFLAGS) -CFLAGS=-WX $(GENERATED_CFLAGS) + $(SMI_CFLAGS) $(GEOIP_CFLAGS) -CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL +CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) !IFDEF LUA_DIR WSLUA_LIB=wslua\wslua.lib |