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

Use gtk 2.12.1 

svn path=/trunk/; revision=23229
This commit is contained in:
Anders Broman 2007-10-18 21:29:19 +00:00
parent 2ec096726e
commit 4f35e112ac
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.nmake
View File

@ -617,9 +617,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK2_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib-2.14.1.zip
glib gtk2.12/glib-2.14.2.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib-dev-2.14.1.zip
glib gtk2.12/glib-dev-2.14.2.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.10"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.10/glib-2.12.13.zip
@ -688,9 +688,9 @@ process_libs:
!IFDEF GTK2_DIR
!IF "$(GTK2_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/gtk+-2.12.0.zip
gtk2 gtk2.12/gtk+-2.12.1.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/gtk+-dev-2.12.0.zip
gtk2 gtk2.12/gtk+-dev-2.12.1.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/cairo-1.4.10.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -732,9 +732,9 @@ process_libs:
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.18"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/pango-1.18.2.zip
gtk2 gtk2.12/pango-1.18.3.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/pango-dev-1.18.2.zip
gtk2 gtk2.12/pango-dev-1.18.3.zip
!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/pango-1.16.4.zip

4
tools/win32-setup.sh
View File

@ -6,10 +6,10 @@
# 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-09-28/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-10-18/packages/"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
err_exit () {
echo ""