diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 06:42:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 06:42:46 +0000 |
| commit | db6795dc82818e7e5526cc7b5757f317eb63f6a1 (patch) | |
| tree | dc8ec723e621b8804ec3f1b02780305a068966a0 /Makefile.nmake | |
| parent | 40b778e01c7b59146468a92e296d3e41a0173bf6 (diff) | |
| download | wireshark-db6795dc82818e7e5526cc7b5757f317eb63f6a1.tar.gz wireshark-db6795dc82818e7e5526cc7b5757f317eb63f6a1.tar.bz2 wireshark-db6795dc82818e7e5526cc7b5757f317eb63f6a1.zip | |
Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 7d8ff85ec3..653cfbfe5b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -715,7 +715,7 @@ process_libs: @$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIBS)" !ENDIF if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) -!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" +!IF "$(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)" \ @@ -787,7 +787,7 @@ process_libs: !ENDIF !IFDEF GTK_DIR -!IF "$(GTK_INST_VERSION)" == "2.14" || "$(GTK_INST_VERSION)" == "2.12" +!IF "$(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)" \ @@ -809,7 +809,7 @@ process_libs: !ELSE !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.22" +!IF "$(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)" \ |