diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-09-12 00:27:03 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-09-12 00:27:03 +0000 |
| commit | 04fe34d711fe35345e38a7773b6120f63d08a592 (patch) | |
| tree | 067e5812728b6048421e078381cd1d97c87d8fd0 /gtk/Makefile.nmake | |
| parent | 0dbb8ffcaf8dca413c4768e716e2efd4527fa2d0 (diff) | |
various nmake related build file cleanups
svn path=/trunk/; revision=19198
Diffstat (limited to 'gtk/Makefile.nmake')
| -rw-r--r-- | gtk/Makefile.nmake | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index e508398ae0..94ef90f906 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -10,39 +10,28 @@ include ..\config.nmake CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ - /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \ - /I$(NET_SNMP_DIR)\win32 /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \ - /I$(PORTAUDIO_DIR)\pa_common \ -!IFDEF HHC_DIR - /I$(HHC_DIR)\include -DHHC_DIR -!ENDIF + /I$(PCAP_DIR)\include $(NET_SNMP_CFLAGS) \ + /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \ + $(PORTAUDIO_CFLAGS) \ + $(HHC_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL -!IFDEF WIRESHARK_EUG_DIR -EUG_CFLAGS=-DWIRESHARK_EUG_DIR -!ENDIF - .c.obj:: - $(CC) $(CVARSDLL) $(CFLAGS) $(EUG_CFLAGS) -Fd.\ -c $< + $(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $< include Makefile.common # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -!IFDEF PORTAUDIO_DIR WIRESHARK_WIN32_GTK_SRC = \ $(WIRESHARK_GTK_SRC) \ print_mswin.c \ win32-file-dlg.c \ +!IFDEF PORTAUDIO_DIR rtp_player.c \ pa_lib.c \ pa_win_wmme.c -!ELSE -WIRESHARK_WIN32_GTK_SRC = \ - $(WIRESHARK_GTK_SRC) \ - print_mswin.c \ - win32-file-dlg.c !ENDIF WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj) @@ -59,7 +48,7 @@ wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../make-tapreg-dotc Makefile.comm @$(SH) ../make-tapreg-dotc wireshark-tap-register.c . $(WIRESHARK_TAP_SRC) 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 -o $@ pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c $(CC) -c /Zi /W1 /Od /I$(PORTAUDIO_DIR)\pa_common $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c -o $@ |