diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2014-01-27 19:22:10 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2014-01-27 19:22:10 +0000 |
| commit | a40f824e0eefde7441f0c42f8b322bae98a8d437 (patch) | |
| tree | 9d195935ac7e46ba56fc5180977c65078be03946 /config.nmake | |
| parent | 257e301696826d4d8708b4e719b946a486be952d (diff) | |
Make it easier to try GTK 3.6
svn path=/trunk/; revision=54986
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 156c8de380..e25c554d28 100644 --- a/config.nmake +++ b/config.nmake @@ -285,6 +285,7 @@ GDK_DLL=libgdk-3-0.dll GTK_DLL=libgtk-3-0.dll PKG_SUFIX=ws GTK_PKG=3.4.4-2.1 +#GTK_PKG=3.6.1-1.1 !ENDIF # @@ -297,6 +298,7 @@ GTK_PKG=3.4.4-2.1 GTK_INST_VERSION=2.24 !ELSE GTK_INST_VERSION=3.4 +#GTK_INST_VERSION=3.6 !ENDIF # @@ -529,6 +531,7 @@ GDK_DLL=libgdk-3-0.dll GTK_DLL=libgtk-3-0.dll PKG_SUFIX=ws GTK_PKG=3.4.4-2.1 +#GTK_PKG=3.6.1-1.1 !ENDIF # @@ -541,7 +544,8 @@ GTK_PKG=3.4.4-2.1 #GTK_INST_VERSION=2.16 GTK_INST_VERSION=2.24 !ELSE -GTK_INST_VERSION=3.4 +#GTK_INST_VERSION=3.4 +GTK_INST_VERSION=3.6 !ENDIF # @@ -1348,7 +1352,7 @@ NEED_JPEG_DLL=USE NEED_TIFF_DLL=USE NEED_LZMA_DLL=USE -!ELSEIF "$(GTK_INST_VERSION)" == "3.4" +!ELSEIF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6" # GTK+ ## Note: If Wireshark is ever to be built with Gtk >= 3.10 |