aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/Makefile.nmake
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2015-09-02 14:09:34 -0400
committerBill Meier <wmeier@newsguy.com>2015-09-02 18:35:17 +0000
commite1541182cb657f11de219d6fcc3c7a4a2bbdb3e7 (patch)
tree63462cea96ea0db9537e562700861e433fd76bce /epan/dissectors/Makefile.nmake
parentc8bdb95d21427284bd209179e03b191aff895bcb (diff)
Fix one more MSVC2015 issue: "[...]ignoring unknown option '/Zd'"
Remove some old cruft which compiled packet-rrc.c with '/Zd' option for certain very old Microsoft C compilers which we no longer support (e.g., MSVC6!). Change-Id: I47f7ab8c92b9e495acedfe76260d607a01c2a40f Reviewed-on: https://code.wireshark.org/review/10362 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
-rw-r--r--epan/dissectors/Makefile.nmake15
1 files changed, 0 insertions, 15 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 0fe3442868..abde78d1ec 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -28,21 +28,6 @@ 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)" != "MSVC2005" && \
- "$(MSVC_VARIANT)" != "MSVC2005EE" && \
- "$(MSVC_VARIANT)" != "MSVC2008" && \
- "$(MSVC_VARIANT)" != "MSVC2008EE" && \
- "$(MSVC_VARIANT)" != "MSVC2010" && \
- "$(MSVC_VARIANT)" != "MSVC2010EE" && \
- "$(MSVC_VARIANT)" != "MSVC2012" && \
- "$(MSVC_VARIANT)" != "MSVC2012EE" && \
- "$(MSVC_VARIANT)" != "MSVC2013" && \
- "$(MSVC_VARIANT)" != "MSVC2013EE"
-# Disable debug for large dissectors
-packet-rrc.obj : packet-rrc.c
- $(CC) $(CFLAGS) /Zd /Fd.\ -c $?
-!ENDIF
-
#
# Build register.c, which contains a function register_all_protocols()
# that calls the register routines for all protocols and a function