diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-01-30 22:57:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-01-30 22:57:09 +0000 |
| commit | e61e93baaeb316d7a10d0bee1a0f359a7e36e1b4 (patch) | |
| tree | d28b7ace3044883a59e027ba86a206cd34bb5207 /config.nmake | |
| parent | d29d5bf966723d9d4eb01513dcb26319f1de0b6a (diff) | |
Rework optional generation of .sbr & .bsc files.
svn path=/trunk/; revision=40779
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/config.nmake b/config.nmake index 4320d6fb96..6679568566 100644 --- a/config.nmake +++ b/config.nmake @@ -702,19 +702,22 @@ MANIFEST_INFO_REQUIRED=1 !ENDIF # Compiler flags: -# /W3 Warning level 3 (0 less - 4 most, 1 default) -# /Zi Create .pdb file for debugging -# /FR Create .sbr file with complete symbolic information -# add to local flags if you want to build the .sbr files. -# /MD Use "multithread- and DLL-specific version" of run-time libraries +# /W3 Warning level 3 (0 less - 4 most, 1 default). +# /Zi Create .pdb file for debugging. +# /FR Create .sbr file with complete symbolic information. +# add to standard CFLAGS if you want to build the .sbr files +# for Wireshark compiles. +# Warning: using /FR for Wireshark requires ~1Gig of additional disk space +# XXX: provides less functionality for VC8, ... than for previous compilers ? +# /MD Use "multithread- and DLL-specific version" of run-time libraries. # msvc documentation states that /MD causes _MT and _DLL to be defined # See: http://msdn.microsoft.com/en-us/library/2kzt1wy3%28v=VS.90%29.aspx -# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls, -# see MSDN "Security Enhancements in the CRT" -# /D_CRT_NONSTDC_NO_DEPRECATE Don't warn for "Deprecated CRT Functions" as MSDN calls this -# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match +# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls; +# see MSDN "Security Enhancements in the CRT". +# /D_CRT_NONSTDC_NO_DEPRECATE Don't warn for "Deprecated CRT Functions" as MSDN calls this. +# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match. # (http://msdn.microsoft.com/en-us/library/cc664727.aspx) -# /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h) +# /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h). # /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load # a second copy of the CRT. # @@ -773,12 +776,14 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX- #STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc) STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" /DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) +# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake +!IFDEF WIRESHARK_GENERATE_BSC_FILE +STANDARD_CFLAGS= $(STANDARD_CFLAGS) /FR +!ENDIF + #Comment out the following if warnings are not to be treated as errors WARNINGS_ARE_ERRORS=-WX -## XXX: _MT and _DLL are defined when /MD is used so CVARSDLL is apparently unneeded -##CVARSDLL=-D_MT -D_DLL - # Linker flags: # /DEBUG generate debug info # /PROFILE generate map file(s) for profiling |