aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-15 16:56:31 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-02-15 16:56:31 +0000
commit223c88ab966d18522d9b6cfa27dad12ff368caaa (patch)
tree3649c43ded13cfb9b419c8654db279c78ec6af6f /config.nmake
parent6e40dfa6fb6cf224a71b56176a938aa9377c5488 (diff)
Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_ERRORS
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35952 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake
index 0ae2500dc8..e67192ff02 100644
--- a/config.nmake
+++ b/config.nmake
@@ -772,7 +772,8 @@ MANIFEST_INFO_REQUIRED=1
# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load
# a second copy of the CRT.
#
-##Note: LOCAL_CFLAGS is used used for *all* compilations
+##Note: LOCAL_CFLAGS are flags used for *all* compilations
+## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations
!IF "$(MSVC_VARIANT)" == "MSVC6" || \
"$(MSVC_VARIANT)" == "MSVC2002" || \
"$(MSVC_VARIANT)" == "DOTNET10" || \
@@ -830,9 +831,10 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
!ENDIF
-#STANDARD_CFLAGS is used only for Wireshark source compiles
+#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+#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