diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-11-16 09:15:15 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-11-16 09:15:15 +0000 |
| commit | 4323fa647d796e7bf7e9151fe6cefa0c2315ff96 (patch) | |
| tree | 49c850286d2756357041e2e22143c424e073dbe0 /gtk | |
| parent | 8921865a9352b1168bc418c3d0f8eec38a0286a3 (diff) | |
Try to clean up the makefile a bit.
svn path=/trunk/; revision=34898
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.nmake | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 688c93736d..240d73e3fd 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -8,13 +8,16 @@ include ..\Makefile.nmake.inc ############### no need to modify below this line ######### -CFLAGS=-WX -DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ +# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output +GENERATED_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 $(AIRPCAP_CFLAGS) \ /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \ $(PORTAUDIO_CFLAGS) \ $(HHC_CFLAGS) + +CFLAGS=-WX $(GENERATED_CFLAGS) CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL @@ -85,13 +88,7 @@ RUNLEX=..\tools\runlex.sh text_import_scanner.h: text_import_scanner.c text_import_scanner.obj : text_import_scanner.c - $(CC) $(CVARSDLL) -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 $(AIRPCAP_CFLAGS) \ - /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \ - $(PORTAUDIO_CFLAGS) \ - $(HHC_CFLAGS) -Fd.\ -c $? + $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $? !IF "$(PORTAUDIO_VERSION)" == "18" pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c |