diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-09-16 21:08:18 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-09-16 21:08:18 +0000 |
| commit | dca05ab0959c8cf62a50f38b43de7ba7acc5b422 (patch) | |
| tree | 01b34772995fbc2a9326a238bfd50bb195063656 /gtk/Makefile.nmake | |
| parent | 1a5f6b20bdb9fbe6f7f59a963ff82f9db2e98d09 (diff) | |
Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.
Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26219 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/Makefile.nmake')
| -rw-r--r-- | gtk/Makefile.nmake | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 36f80063ae..a5e6aa992c 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -67,52 +67,52 @@ 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 $? + $(CC) -c $(LOCAL_CFLAGS) $? pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? !ELSE pa_front.obj: $(PORTAUDIO_DIR)\src\common\pa_front.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_allocation.obj: $(PORTAUDIO_DIR)\src\common\pa_allocation.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_converters.obj: $(PORTAUDIO_DIR)\src\common\pa_converters.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_cpuload.obj: $(PORTAUDIO_DIR)\src\common\pa_cpuload.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_dither.obj: $(PORTAUDIO_DIR)\src\common\pa_dither.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_process.obj: $(PORTAUDIO_DIR)\src\common\pa_process.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_skeleton.obj: $(PORTAUDIO_DIR)\src\common\pa_skeleton.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_stream.obj: $(PORTAUDIO_DIR)\src\common\pa_stream.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_trace.obj: $(PORTAUDIO_DIR)\src\common\pa_trace.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_win_wmme.obj: $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_win_util.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_win_hostapis.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_x86_plain_converters.obj: $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c - $(CC) -c /Zi /W1 /Od /MD $(PORTAUDIO_CFLAGS) $? + $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? !ENDIF |