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

Use the latest GTK stuff. 

svn path=/trunk/; revision=21122
This commit is contained in:
Anders Broman 2007-03-22 22:26:59 +00:00
parent e9bb1d5670
commit 4c92cbef0e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.nmake
View File

@ -536,9 +536,9 @@ setup: verify_tools clean_setup
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK2_INST_VERSION)" == "2.10"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.10/glib-2.12.10.zip
glib gtk2.10/glib-2.12.11.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.10/glib-dev-2.12.10.zip
glib gtk2.10/glib-dev-2.12.11.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.8/glib-2.12.4.zip
@ -621,9 +621,9 @@ setup: verify_tools clean_setup
!IFDEF GTK2_DIR
!IF "$(GTK2_INST_VERSION)" == "2.10"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/gtk+-2.10.9.zip
gtk2 gtk2.10/gtk+-2.10.11.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/gtk+-dev-2.10.9.zip
gtk2 gtk2.10/gtk+-dev-2.10.11.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/cairo-1.4.0.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@ -677,7 +677,12 @@ setup: verify_tools clean_setup
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2/atk-dev-1.4.0.zip
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.14"
!IF "$(PANGO_INST_VERSION)" == "1.16"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/pango-1.16.1.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/pango-dev-1.16.1.zip
!ELSEIF "$(PANGO_INST_VERSION)" == "1.14"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/pango-1.14.10.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \

2
config.nmake
View File

@ -122,7 +122,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
#PANGO_INST_VERSION=1.14
# GTK 2.10 is the mainline since Wireshark 0.99.5
GTK2_INST_VERSION=2.10
PANGO_INST_VERSION=1.14
PANGO_INST_VERSION=1.16
#
# If you have GTK-Wimp, set this to the pathname of the directory in

2
tools/win32-setup.sh
View File

@ -4,7 +4,7 @@
# http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-03-14/packages"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-03-22/packages"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"