From a24c615bd27213ff2cbac1d7f42b09660a9abb7d Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 21 Mar 2017 17:02:05 +0100
Subject: Fix windows GLFW build.

---
 platform/gl/gl-main.c         |  2 +-
 platform/win32/libglfw.vcproj | 31 +++++++++++++++++++++++--------
 thirdparty/glfw               |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
index 3f063b92..fee7d40c 100644
--- a/platform/gl/gl-main.c
+++ b/platform/gl/gl-main.c
@@ -720,9 +720,9 @@ static void toggle_fullscreen(void)
 	static int win_rr = 60;
 	if (!isfullscreen)
 	{
+		const GLFWvidmode *mode = glfwGetVideoMode(monitor);
 		glfwGetWindowPos(window, &win_x, &win_y);
 		glfwGetWindowSize(window, &win_w, &win_h);
-		const GLFWvidmode *mode = glfwGetVideoMode(monitor);
 		win_rr = mode->refreshRate;
 		glfwSetWindowMonitor(window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate);
 		isfullscreen = 1;
diff --git a/platform/win32/libglfw.vcproj b/platform/win32/libglfw.vcproj
index d0f50eab..88e06076 100644
--- a/platform/win32/libglfw.vcproj
+++ b/platform/win32/libglfw.vcproj
@@ -43,6 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -168,6 +169,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL;MEMENTO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -293,6 +295,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\thirdparty\glfw\deps\mingw"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_GLFW_WIN32;_GLFW_WGL;_GLFW_USE_OPENGL"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -413,6 +416,14 @@
 				RelativePath="..\..\thirdparty\glfw\src\context.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\thirdparty\glfw\src\egl_context.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\glfw\src\egl_context.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\thirdparty\glfw\src\init.c"
 				>
@@ -429,6 +440,10 @@
 				RelativePath="..\..\thirdparty\glfw\src\monitor.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\thirdparty\glfw\src\vulkan.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\thirdparty\glfw\src\wgl_context.c"
 				>
@@ -441,6 +456,14 @@
 				RelativePath="..\..\thirdparty\glfw\src\win32_init.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\thirdparty\glfw\src\win32_joystick.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\thirdparty\glfw\src\win32_joystick.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\thirdparty\glfw\src\win32_monitor.c"
 				>
@@ -469,14 +492,6 @@
 				RelativePath="..\..\thirdparty\glfw\src\window.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\thirdparty\glfw\src\winmm_joystick.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\thirdparty\glfw\src\winmm_joystick.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/thirdparty/glfw b/thirdparty/glfw
index 644123fe..0ab0c5a5 160000
--- a/thirdparty/glfw
+++ b/thirdparty/glfw
@@ -1 +1 @@
-Subproject commit 644123fe63668c4b261f729af9cabfb361cbd901
+Subproject commit 0ab0c5a5b9edf0fd0e1ecbee0c777b9a837564b0
-- 
cgit v1.2.3