Ethereal-dev: Re: [Ethereal-dev] MSVC-makefile modifications for glib2 and gtk2

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Guy Harris <gharris@xxxxxxxxx>
Date: Fri, 13 Jun 2003 15:35:54 -0700
On Sat, Jun 14, 2003 at 12:20:41AM +0200, Lars Roland wrote:
> Index: ethereal/wiretap/Makefile.nmake
> ===================================================================
> RCS file: /cvsroot/ethereal/wiretap/Makefile.nmake,v
> retrieving revision 1.28
> diff -u -r1.28 Makefile.nmake
> --- ethereal/wiretap/Makefile.nmake	31 Jul 2002 19:27:56 -0000	1.28
> +++ ethereal/wiretap/Makefile.nmake	13 Jun 2003 19:52:02 -0000
> @@ -7,7 +7,7 @@
>  
>  ############### no need to modify below this line #########
>  
> -CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
> +CFLAGS=-DHAVE_CONFIG_H /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
>  	-D_U_="" $(LOCAL_CFLAGS)
>  
>  .c.obj::
> @@ -42,7 +42,11 @@
>  
>  
>  wiretap_LIBS = \
> -	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib	\
> +!IF "$(GLIB_VERSION)" == "2.0"
> +	$(LIB_DIR)\glib-$(GLIB_VERSION).lib \
> +!ELSE
> +	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
> +!ENDIF
>  	$(ZLIB_DIR)\zlib.lib

What is the change to use LIB_DIR for?

Should that be done for GLib/GTK+ 1.2[.x] as well?