diff options
author | Gerald Combs <gerald@wireshark.org> | 2008-08-14 20:56:34 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2008-08-14 20:56:34 +0000 |
commit | bb8e507f31b67823b2be1b487dbf52713cb88e9f (patch) | |
tree | 744c59c2a71e8d43d206043e7275454063922443 | |
parent | 82391276617eea2ce1c0a5b08b55ba1cdb7b0ce2 (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
-rw-r--r-- | epan/dissectors/Makefile.nmake | 4 | ||||
-rw-r--r-- | gtk/Makefile.nmake | 32 |
2 files changed, 19 insertions, 17 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; diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 11218b7510..be0475a42b 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -67,53 +67,53 @@ wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../make-tapreg-dotc Makefile.comm !IF "$(PORTAUDIO_VERSION)" == "18" pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_DIR)\pa_common\pa_lib.c -o $@ + $(CC) -c /Zi /W1 /Od $(PORTAUDIO_DIR)\pa_common\pa_lib.c $? pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c $? !ELSE pa_front.obj: $(PORTAUDIO_DIR)\src\common\pa_front.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_front.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_front.c $? pa_allocation.obj: $(PORTAUDIO_DIR)\src\common\pa_allocation.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_allocation.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_allocation.c $? pa_converters.obj: $(PORTAUDIO_DIR)\src\common\pa_converters.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_converters.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_converters.c $? pa_cpuload.obj: $(PORTAUDIO_DIR)\src\common\pa_cpuload.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_cpuload.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_cpuload.c $? pa_dither.obj: $(PORTAUDIO_DIR)\src\common\pa_dither.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_dither.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_dither.c $? pa_process.obj: $(PORTAUDIO_DIR)\src\common\pa_process.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_process.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_process.c $? pa_skeleton.obj: $(PORTAUDIO_DIR)\src\common\pa_skeleton.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_skeleton.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_skeleton.c $? pa_stream.obj: $(PORTAUDIO_DIR)\src\common\pa_stream.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_stream.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_stream.c $? pa_trace.obj: $(PORTAUDIO_DIR)\src\common\pa_trace.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_trace.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\common\pa_trace.c $? pa_win_wmme.obj: $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c $? pa_win_util.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c $? pa_win_hostapis.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c $? pa_x86_plain_converters.obj: $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c -o $@ + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c $? pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c - $(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) -o $@ $? + $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? !ENDIF |