From 1d3240ff9c09603b1ff2c35b7628b979eef55331 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 5 Aug 2016 01:32:23 +0200 Subject: [PATCH] Fix Vulkan header macro not breaking compilation Fixes #823. --- README.md | 2 ++ src/internal.h | 1 + 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index f61d1dc4..567f1d48 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,8 @@ information on what to include when reporting a bug. loader linked statically into the application - Bugfix: Single compilation unit builds failed due to naming conflicts (#783) - Bugfix: The range checks for `glfwSetCursorPos` used the wrong minimum (#773) + - Bugfix: Defining `GLFW_INCLUDE_VULKAN` when compiling the library did not + fail with the expected error message (#823) - [Win32] Bugfix: `glfwSetClipboardString` created an unnecessary intermediate copy of the string - [Win32] Bugfix: Examples failed to build on Visual C++ 2010 due to C99 in diff --git a/src/internal.h b/src/internal.h index 8fc685b7..8e84efd2 100644 --- a/src/internal.h +++ b/src/internal.h @@ -40,6 +40,7 @@ defined(GLFW_INCLUDE_NONE) || \ defined(GLFW_INCLUDE_GLEXT) || \ defined(GLFW_INCLUDE_GLU) || \ + defined(GLFW_INCLUDE_VULKAN) || \ defined(GLFW_DLL) #error "You must not define any header option macros when compiling GLFW" #endif