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.

From: Lars Roland <Lars.Roland@xxxxxxx>
Date: Sat, 14 Jun 2003 00:52:51 +0200
Hello,

Guy Harris wrote:
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?



All developer packages on http://www.gimp.org/~tml/gimp/win32/downloads.html concentrate their libraries and the config header file in subdirectory "\lib" , while all other header files are in subdirectory "\inculde". I defined LIB_DIR to be the \lib subdirectory. I need this only for these packages. It is not necessary for the packages from the etherel-website.