osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert GTK+/GLIB to GTK+ 2.12.1 with GLib 2.14.3 for Windows installs 

as a workaround for bug 2066. We should stick to these versions until
bug report #503326 on bugzilla.gnome.org has been fixed.


svn path=/trunk/; revision=24219
This commit is contained in:
Sake Blok 2008-01-29 10:48:53 +00:00
parent 70d1699bb2
commit c024c88a0b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.nmake
View File

@ -642,9 +642,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.5.zip
glib gtk2.12/glib-2.14.3.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib-dev-2.14.5.zip
glib gtk2.12/glib-dev-2.14.3.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
@ -713,9 +713,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.5.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.5.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.14.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \