diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-23 22:21:30 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-23 22:21:30 +0000 |
| commit | 4f85954843e0f197639a011858cd46f9a7dbc4b2 (patch) | |
| tree | bb52fc4845930428eb371174b8eaa9ad5b45feb4 /config.nmake | |
| parent | 33db0ee59cacdc446174c005ba656ce312bc89d0 (diff) | |
From Lars Roland: define an "installation" version of GTK+ 2.x and Pango
in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories. Also, when uninstalling, remove both of the sets of
subdirectories.
As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10976 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index f1ed3036a8..618c31674c 100644 --- a/config.nmake +++ b/config.nmake @@ -1,4 +1,4 @@ -# $Id: config.nmake,v 1.88 2004/05/13 03:34:14 gerald Exp $ +# $Id: config.nmake,v 1.89 2004/05/23 22:21:30 guy Exp $ VERSION=0.10.4 # @@ -56,6 +56,13 @@ GLIB_DIR=$(ETHEREAL_LIBS)\glib GTK1_DIR=$(ETHEREAL_LIBS)\gtk+ #GTK2_DIR=$(ETHEREAL_LIBS)\gtk2 +# Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number +# but without MICRO version number) +# These macros are used by the nsis installer script. +# +GTK2_INST_VERSION=2.2 +PANGO_INST_VERSION=1.2 + # # If you have GTK-Wimp, set this to the pathname of the directory in # which the files are stored. @@ -187,7 +194,6 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib # GTK+ 1.3 -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 \ @@ -195,18 +201,16 @@ GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \ $(GLIB_LIBS) # GTK+ 2.x -GTK2_VERSION=2.0 -GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-$(GTK2_VERSION) \ - /I$(GTK2_DIR)\lib\gtk-$(GTK2_VERSION)\include \ +GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \ + /I$(GTK2_DIR)\lib\gtk-2.0\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_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \ + $(GTK2_DIR)\lib\gdk-win32-2.0.lib \ + $(GTK2_DIR)\lib\gdk_pixbuf-2.0.lib \ $(GTK2_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) - !IFDEF WINPCAP_VERSION # Nmake uses carets to escape special characters WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1 |