osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Lars Roland: add support for GTK+ 1.3 with GLib 2.0 (the latest 

GTK+ 1.3[.x]-for-Win32, which fixes several GTK+ problems, requires GLib
2.0, not GLib 1.3).

svn path=/trunk/; revision=8125
This commit is contained in:
Guy Harris 2003-08-04 08:10:33 +00:00
parent 29e5ea2e2a
commit 0f9b1a0458
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.nmake
View File

@ -1,4 +1,4 @@
# $Id: config.nmake,v 1.54 2003/07/23 02:06:24 gerald Exp $
# $Id: config.nmake,v 1.55 2003/08/04 08:10:33 guy Exp $
VERSION=0.9.14
#
@ -92,12 +92,24 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
!ENDIF
!IF "$(GTK_VERSION)" == "1.3"
!IF "$(GLIB_VERSION)" == "1.3"
# GTK+ 1.3 with GLib 1.3
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR) /I$(GTK_DIR)\gdk
GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
$(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
$(GLIB_LIBS)
!ELSE
# GTK+ 1.3 with GLib 2.0
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 \
$(GLIB_LIBS)
!ENDIF
!ELSE
# GTK+ 2.x (with GLib 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 \