osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use GTK 2.16 and glib 2.20. 

svn path=/trunk/; revision=27762
This commit is contained in:
Anders Broman 2009-03-17 20:21:16 +00:00
parent 9fd55bf111
commit 2a6752e050
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.nmake
View File

@ -715,7 +715,7 @@ process_libs:
@$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIBS)"
!ENDIF
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk$(GTK_INST_VERSION)/glib_$(GLIB_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -787,7 +787,7 @@ process_libs:
!ENDIF
!IFDEF GTK_DIR
!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/gtk+_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -809,7 +809,7 @@ process_libs:
!ELSE
!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.22"
!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk$(GTK_INST_VERSION)/pango_$(PANGO_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \

30
config.nmake
View File

@ -135,7 +135,7 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
#
GLIB_VERSION=2.0
GLIB_PKG=2.18.4-1
GLIB_PKG=2.20.0-1
GLIB_DIR=$(WIRESHARK_LIBS)\glib
#
@ -147,13 +147,13 @@ GLIB_DIR=$(WIRESHARK_LIBS)\glib
# directory in which the "include" and "lib" directories reside.
#
GTK_DIR=$(WIRESHARK_LIBS)\gtk2
GTK_PKG=2.14.7-1
GTK_PKG=2.16.0-1
CAIRO_PKG=1.8.6-1
ATK_PKG=1.24.0-1
LIBPNG_PKG=1.2.32-1
TIFF_PKG=tiff-3.8.2-1-bin
LIBPNG_PKG=1.2.34-1
TIFF_PKG=libtiff-3.8.2
JPEG_PKG=jpeg-6b-4-bin
PANGO_PKG=1.22.2-1
PANGO_PKG=1.24.0-1
#
# Mandatory: Version numbers of GTK and pango.
@ -162,8 +162,8 @@ PANGO_PKG=1.22.2-1
# These macros are used by the nsis installer script and by the setup target.
#
# GTK 2.12 is the mainline since Wireshark 0.99.7
GTK_INST_VERSION=2.14
PANGO_INST_VERSION=1.22
GTK_INST_VERSION=2.16
PANGO_INST_VERSION=1.24
#
# Optional: WinPcap developer's pack to capture network traffic.
@ -905,7 +905,17 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
$(GTK_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
!IF "$(GTK_INST_VERSION)" == "2.14"
!IF "$(GTK_INST_VERSION)" == "2.16"
GTK_LIB_DIR=2.10.0
NEED_LIBPNG_DLL=USE
NEED_LIBJPEG_DLL=USE
NEED_LIBTIFF_DLL=USE
NEED_CAIRO_DLL=USE
GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\2.10.0\engines
GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
GTK_WIMP_RCDST_DIR=etc\gtk-2.0
!ELSEIF "$(GTK_INST_VERSION)" == "2.14"
GTK_LIB_DIR=2.10.0
NEED_LIBPNG_DLL=USE
NEED_LIBJPEG_DLL=USE
@ -929,7 +939,9 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.22"
!IF "$(PANGO_INST_VERSION)" == "1.24"
PANGO_LIB_DIR=1.5.0
!ELSEIF "$(PANGO_INST_VERSION)" == "1.22"
PANGO_LIB_DIR=1.5.0
!ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
PANGO_LIB_DIR=1.5.0

4
tools/win32-setup.sh
View File

@ -9,10 +9,10 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save previous tag.
DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-02-09"}
DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-03-17"}
WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"}
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/"
TAG_FILE="current_tag.txt"