diff options
| -rw-r--r-- | Makefile.nmake | 8 | ||||
| -rw-r--r-- | config.nmake | 10 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 7809cae3e2..f1b17083b9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -735,7 +735,7 @@ setup: verify_tools clean_setup process_libs # (The choice is determined by the value of the macro WIN_SETUP_OPT). process_libs: @if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) -!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" +!IF "$(GTK_INST_VERSION)" == "2.18" || "$(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)" \ @@ -803,7 +803,7 @@ process_libs: !ENDIF !IFDEF GTK_DIR -!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" +!IF "$(GTK_INST_VERSION)" == "2.18" || "$(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)" \ @@ -825,7 +825,7 @@ process_libs: !ELSE !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" +!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(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)" \ @@ -834,7 +834,7 @@ process_libs: !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF !ENDIF -# PANGO 1.24.5 needs these DLL:s +# PANGO >=1.24.5 needs these DLL:s !IFDEF NEED_FREETYPE_DLL @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ expat gtk$(GTK_INST_VERSION)/expat_$(EXPAT_PKG)_$(WIRESHARK_TARGET_PLATFORM).zip diff --git a/config.nmake b/config.nmake index d68a7e648b..87ca9d0818 100644 --- a/config.nmake +++ b/config.nmake @@ -167,7 +167,7 @@ ATK_PKG=1.26.0-1 LIBPNG_PKG=1.2.39-1 TIFF_PKG=libtiff_3.9.1-1_win32 JPEG_PKG=jpeg_7-1_win32 -PANGO_PKG=1.24.5-2 +PANGO_PKG=1.26.0-1 FREETYPE_PKG=2.3.9-1 FONTCONFIG_PKG=2.7.3-1 EXPAT_PKG=2.0.1-1 @@ -180,7 +180,7 @@ EXPAT_PKG=2.0.1-1 # # GTK 2.12 is the mainline since Wireshark 0.99.7 GTK_INST_VERSION=2.16 -PANGO_INST_VERSION=1.24 +PANGO_INST_VERSION=1.26 # # Mandatory for GTK >= 2: Gettext @@ -964,14 +964,14 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16" +!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16" PANGO_LIB_DIR=1.5.0 !ELSE !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" -#PANGO 1.24.5 Needs these: +!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" +#PANGO >=1.24.5 Needs these: NEED_FREETYPE_DLL=USE NEED_FONTCONFIG_DLL=USE NEED_EXPAT_DLL=USE diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 5f402d1acb..a64ecbd7c3 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -4,7 +4,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2009-10-20" +export DOWNLOAD_TAG="2009-10-25" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` |