diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 09:59:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 09:59:40 +0000 |
| commit | c5ce562d607ad1c714ba645ef5ee4f8412ee2fa4 (patch) | |
| tree | ffcc952fdfb1b985a97e5168fd65a22cb78eac74 /Makefile.nmake | |
| parent | 1637e691183cee8457231076654c5e25b06b257d (diff) | |
Use pango 1.26
svn path=/trunk/; revision=30687
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 4 insertions, 4 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 |