Wireshark-dev: Re: [Wireshark-dev] Beware of upcoming changes in Win32's config.nmake -> might
Ulf Lamping wrote:
Hi List!
I'm going to cleanup the config.nmake file in the next days.
This file is in need of a cleanup (I've done the last real cleanup years
ago), as it's naming scheme is now inconsistent, the sequence of
settings isn't logical, ...
As a lot of developers will have a tweaked version of that file
(including me) it's likely that "personal" merge conflicts will evolve
-> this will break your personal Win32 builds.
I'll do the changes in smaller steps so at least the buildbot hopefully
won't be interrupted (at least not more than it currently already is).
If you encounter any problems, please check the changes done in
config.nmake and do a distclean before complaining to this list :-)
Regards, ULFL
_______________________________________________
Wireshark-dev mailing list
Wireshark-dev@xxxxxxxxxxxxx
http://www.wireshark.org/mailman/listinfo/wireshark-dev
The following is a patch against a more recent version of config.nmake
but with the same intent as my previous post, please consider the changes.
/ Regards, Peter
Index: C:/wireshark-win32-libs/config.nmake
===================================================================
--- C:/wireshark-win32-libs/config.nmake (revision 19099)
+++ C:/wireshark-win32-libs/config.nmake (working copy)
@@ -24,11 +24,32 @@
##### Libraries #####
+# Define which GTK2 version to use by setting USE_GTK2_VERSION to either of
+# 2.4, 2.6 or 2.8.
+USE_GTK2_VERSION=2.6
+
+!IF "$(USE_GTK2_VERSION)" == "2.4"
+GTK2_SUB_LIB_DIR=GTK2_v2.4
+GTK2_INST_VERSION=2.4
+PANGO_INST_VERSION=1.4
+!ELSEIF "$(USE_GTK2_VERSION)" == "2.6"
+GTK2_SUB_LIB_DIR=GTK2_v2.6
+GTK2_INST_VERSION=2.6
+PANGO_INST_VERSION=1.8
+!ELSEIF "$(USE_GTK2_VERSION)" == "2.8"
+GTK2_SUB_LIB_DIR=GTK2_v2.8
+GTK2_INST_VERSION=2.8
+PANGO_INST_VERSION=1.10
+!ENDIF
+
+# Define where to find the GTK1 files
+GTK1_SUB_LIB_DIR=GTK1
+
#
# Base directory, where your libraries reside, which needs to be
# compiling the sources. This setting is used only inside this file.
#
-WIRESHARK_LIBS=C:\wireshark-win32-libs
+WIRESHARK_LIBS=C:\wireshark-non-svn-libs
#
# Mandatory: GLib settings
@@ -38,7 +59,7 @@
# support them. Upgrade to at least GLib 2.0.
#
GLIB_VERSION=2.0
-GLIB_DIR=$(WIRESHARK_LIBS)\glib
+GLIB_DIR=$(WIRESHARK_LIBS)\$(GTK2_SUB_LIB_DIR)\glib
#
# Mandatory: GTK (& related) settings
@@ -51,8 +72,8 @@
# the pathname of the directory in which the "include" and "lib" directories
# reside.
#
-GTK1_DIR=$(WIRESHARK_LIBS)\gtk+
-GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK1_DIR=$(WIRESHARK_LIBS)\$(GTK1_SUB_LIB_DIR)\gtk+
+GTK2_DIR=$(WIRESHARK_LIBS)\$(GTK2_SUB_LIB_DIR)\gtk2
#
# Mandatory for GTK >= 2: Version numbers of gtk2 and pango.
@@ -65,8 +86,8 @@
#GTK2_INST_VERSION=2.4
#PANGO_INST_VERSION=1.4
# GTK 2.6 is the mainline since Ethereal 0.10.14
-GTK2_INST_VERSION=2.6
-PANGO_INST_VERSION=1.8
+#GTK2_INST_VERSION=2.6
+#PANGO_INST_VERSION=1.8
# Support for GTK 2.8 is currently experimental ...
#GTK2_INST_VERSION=2.8
#PANGO_INST_VERSION=1.10
@@ -81,7 +102,7 @@
# Please note: GTK 2.8 (and later?) includes GTK-Wimp
# (in this case these GTK-Wimp related settings will have no effect)
#
-GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
+GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp
GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
#
