Added the ability to compile both GTK versions 1 and 2 at the same time.

svn path=/trunk/; revision=9827

1 files changed, 26 insertions, 27 deletions

diff --git a/config.nmake b/config.nmake
index fe6e9561d2..ef3d236256 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.77 2004/01/23 02:38:03 gerald Exp $
+# $Id: config.nmake,v 1.78 2004/01/24 20:01:35 ulfl Exp $
 
 VERSION=0.10.0
 #
@@ -45,18 +45,16 @@ GLIB_DIR=$(ETHEREAL_LIBS)\glib
 # put header files in an "include\gtk-{version}" directory and libraries
 # in a "lib\gtk-{version}" directory.
 #
-# If you're building with GTK+ 1.3, set GTK_VERSION to 1.3 and set
-# GTK_DIR to the pathname of the "gtk+" directory; if you're building
-# with GTK+ 2.x, set GTK_VERSION to 2.0 and set GTK_DIR to the pathname
-# of the directory in which the "include" and "lib" directories reside.
+# It's possible, to build both GTK version 1 and 2 at the same time,
+# or only one of the versions. GTK version 1 is currently recommended.
+# 
+# If you want building with GTK+ 1.3, set GTK1_DIR to the pathname of the 
+# "gtk+" directory; if you want building with GTK+ 2.x, set GTK2_DIR to 
+# the pathname of the directory in which the "include" and "lib" directories 
+# reside.
 #
-GTK_VERSION=1.3
-#GTK_VERSION=2.0
-!IF "$(GTK_VERSION)" == "1.3"
-GTK_DIR=$(ETHEREAL_LIBS)\gtk+
-!ELSE
-GTK_DIR=$(ETHEREAL_LIBS)\gtk2
-!ENDIF
+GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
+#GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
 
 #
 # If you have Zlib, set this to the pathname of the directory in
@@ -168,25 +166,26 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
 	$(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
 	$(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
 
-!IF "$(GTK_VERSION)" == "1.3"
 # GTK+ 1.3
-GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include /I$(GTK_DIR)\include\gdk \
-	/I$(GTK_DIR)\lib\gtk+\include
-GTK_LIBS=$(GTK_DIR)\lib\gtk.lib \
-	$(GTK_DIR)\lib\gdk.lib \
+GTK1_VERSION=1.3
+GTK1_CFLAGS=$(GLIB_CFLAGS) /I$(GTK1_DIR)\include /I$(GTK1_DIR)\include\gdk \
+	/I$(GTK1_DIR)\lib\gtk+\include
+GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
+	$(GTK1_DIR)\lib\gdk.lib \
 	$(GLIB_LIBS)
-!ELSE
+
 # GTK+ 2.x
-GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-$(GTK_VERSION) \
-	/I$(GTK_DIR)\lib\gtk-$(GTK_VERSION)\include \
-	/I$(GTK_DIR)\include\atk-1.0 \
-	/I$(GTK_DIR)\include\pango-1.0
-GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-$(GTK_VERSION).lib \
-	$(GTK_DIR)\lib\gdk-win32-$(GTK_VERSION).lib \
-	$(GTK_DIR)\lib\gdk_pixbuf-$(GTK_VERSION).lib \
-	$(GTK_DIR)\lib\pango-1.0.lib \
+GTK2_VERSION=2.0
+GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-$(GTK2_VERSION) \
+	/I$(GTK2_DIR)\lib\gtk-$(GTK2_VERSION)\include \
+	/I$(GTK2_DIR)\include\atk-1.0 \
+	/I$(GTK2_DIR)\include\pango-1.0
+GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-$(GTK2_VERSION).lib \
+	$(GTK2_DIR)\lib\gdk-win32-$(GTK2_VERSION).lib \
+	$(GTK2_DIR)\lib\gdk_pixbuf-$(GTK2_VERSION).lib \
+	$(GTK2_DIR)\lib\pango-1.0.lib \
 	$(GLIB_LIBS)
-!ENDIF
+
 
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters