Make it easier to try GTK 3.6

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54986 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index c7f743df22c41958273cbe55463b21a758e9115f..99ce77398114377965f4e023cccaa4c616e6934a 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1237,7 +1237,7 @@ install-generated-files: doc
 install-all: install-generated-files
        set copycmd=/y
        if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR)
-!IF "$(GTK_INST_VERSION)" == "3.4"
+!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
        xcopy $(GTK_DIR)\bin\libgdk-3-0.dll $(INSTALL_DIR) /d
        xcopy $(GTK_DIR)\bin\libgtk-3-0.dll $(INSTALL_DIR) /d
 !ELSE
@@ -1254,7 +1254,7 @@ install-all: install-generated-files
        xcopy $(GTK_DIR)\$(GTK_ETC_DIR)\*.* $(INSTALL_DIR)\$(GTK_ETC_DIR) /d
 #      if not exist $(INSTALL_DIR)\etc\pango mkdir $(INSTALL_DIR)\etc\pango
 #      xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d
-!IF "$(GTK_INST_VERSION)" == "3.4"
+!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
        if not exist $(INSTALL_DIR)\lib\gtk-3.0 mkdir $(INSTALL_DIR)\lib\gtk-3.0
        if not exist $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR)
        xcopy ".\ui\win32\settings.ini" $(INSTALL_DIR)\$(GTK_ETC_DIR) /d
@@ -1376,7 +1376,7 @@ install-all: install-generated-files
 !ENDIF
        cd $(INSTALL_DIR)
        peflags --dynamicbase=true --nxcompat=true *.dll
-!IF "$(GTK_INST_VERSION)" == "3.4"
+!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
 !ELSE
        peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/*/engines/*.dll
        peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/modules/*.dll

diff --git a/config.nmake b/config.nmake
index 156c8de38000a558f684e2240612cb046c5827be..e25c554d283cf0fd4ff314e18ad01d059e578fb7 100644 (file)
--- 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