aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-08-14 20:56:34 +0000
committerGerald Combs <gerald@wireshark.org>2008-08-14 20:56:34 +0000
commitbb8e507f31b67823b2be1b487dbf52713cb88e9f (patch)
tree744c59c2a71e8d43d206043e7275454063922443 /epan/dissectors/Makefile.nmake
parent82391276617eea2ce1c0a5b08b55ba1cdb7b0ce2 (diff)
From cjkelly1: Add "/MD" to the PortAudio compilation flags. Fixes
bug 2791. Don't use "-o" in the PortAudio compilation flags. If we're running Visual C++ 2008, don't use "/Zd" when compiling packet-rrc.c. Fixes bug 2795. svn path=/trunk/; revision=26023
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
-rw-r--r--epan/dissectors/Makefile.nmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index c287527234..0faad01843 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -30,9 +30,11 @@ 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)
-# disabled debug for large dissectors
+!IF "$(MSVC_VARIANT)" != "MSVC2008EE" && "$(MSVC_VARIANT)" != "MSVC2008"
+# Disable debug for large dissectors
packet-rrc.obj : packet-rrc.c
$(CC) $(CVARSDLL) $(CFLAGS) -Zd -Fd.\ -c $?
+!ENDIF
#
# The header files listed here are built from x11-fields using Perl;