4 files changed, 8 insertions, 28 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index c6324fc240..a86ff01466 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -20,12 +20,7 @@ if( GLIB2_MAIN_INCLUDE_DIR AND GLIB2_LIBRARIES )
 endif()
 
 include( FindWSWinLibs )
-
-if( ENABLE_GTK3 )
-	FindWSWinLibs( "gtk3" "GLIB2_HINTS" )
-else()
-	FindWSWinLibs( "gtk2" "GLIB2_HINTS" )
-endif()
+FindWSWinLibs( "glib2-*" "GLIB2_HINTS" )
 
 if (NOT WIN32)
 	find_package(PkgConfig)
diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake
index 4698ab5af6..98ddc76467 100644
--- a/cmake/modules/FindGMODULE2.cmake
+++ b/cmake/modules/FindGMODULE2.cmake
@@ -35,15 +35,7 @@ if( GMODULE2_FOUND  )
 	endif()
 else()
 	include( FindWSWinLibs )
-	if( BUILD_wireshark )
-		if( ENABLE_GTK3 )
-			FindWSWinLibs( "gtk3" "GMODULE2_HINTS" )
-		else()
-			FindWSWinLibs( "gtk2" "GMODULE2_HINTS" )
-		endif()
-	else()
-		message( ERROR "Unsupported build setup" )
-	endif()
+	FindWSWinLibs( "glib2-*" "GMODULE2_HINTS" )
 	find_path( GMODULE2_INCLUDE_DIRS
 		NAMES
 			gmodule.h
diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake
index 9d2f7bd614..3aa75e57d4 100644
--- a/cmake/modules/FindGTHREAD2.cmake
+++ b/cmake/modules/FindGTHREAD2.cmake
@@ -29,15 +29,7 @@ if( GTHREAD2_FOUND )
 	endif()
 else()
 	include( FindWSWinLibs )
-	if( BUILD_wireshark )
-		if( ENABLE_GTK3 )
-			FindWSWinLibs( "gtk3" "GTHREAD2_HINTS" )
-		else()
-			FindWSWinLibs( "gtk2" "GTHREAD2_HINTS" )
-		endif()
-	else()
-		message( ERROR "Unsupported build setup" )
-	endif()
+	FindWSWinLibs( "glib2-*" "GTHREAD2_HINTS" )
 	find_path( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0 glib GLib.framework/Headers/glib glib-2.0/glib HINTS "${GTHREAD2_HINTS}/include" )
 	find_library( GTHREAD2_LIBRARIES gthread-2.0 HINTS "${GTHREAD2_HINTS}/lib" )
 	if( NOT GTHREAD2_LIBRARIES )
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 8de1622090..0c26841523 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -87,8 +87,8 @@ Param(
 # trouble instead of trying to catch exceptions everywhere.
 $ErrorActionPreference = "Stop"
 
-$Win64CurrentTag = "2018-03-16"
-$Win32CurrentTag = "2018-03-16"
+$Win64CurrentTag = "2018-04-20"
+$Win32CurrentTag = "2018-04-20"
 
 # Archive file / subdir.
 $Win64Archives = @{
@@ -96,7 +96,7 @@ $Win64Archives = @{
     "bcg729-1.0.4-win64ws.zip" = "";
     "c-ares-1.14.0-win64ws.zip" = "";
     "gnutls-3.4.11-1.35-win64ws.zip" = "";
-    "gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2";
+    "glib2-2.52.2-1.31-win64ws.zip" = "";
     "kfw-3-2-2-x64-ws.zip" = "";
     "libgcrypt-1.7.6-win64ws.zip" = "";
     "libsmi-svn-40773-win64ws.zip" = "";
@@ -119,7 +119,7 @@ $Win32Archives = @{
     "bcg729-1.0.4-win32ws.zip" = "";
     "c-ares-1.14.0-win32ws.zip" = "";
     "gnutls-3.4.11-1.36-win32ws.zip" = "";
-    "gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2";
+    "glib2-2.52.2-1.34-win32ws.zip" = "";
     "kfw-3-2-2-i386-ws-vc6.zip" = "";
     "libgcrypt-1.7.6-win32ws.zip" = "";
     "libsmi-svn-40773-win32ws.zip" = "";
@@ -166,6 +166,7 @@ $CleanupItems = @(
     "gnutls-3.1.22-*-win??ws"
     "gnutls-3.2.15-*-win??ws"
     "gnutls-3.4.11-*-win??ws"
+    "glib2-2.*-win??ws"
     "gtk2"
     "gtk3"
     "kfw-3-2-2-final"