mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Vulkan header macro not breaking compilation

Browse Source 
Fixes #823.
This commit is contained in:
Camilla Berglund 2016-08-05 01:32:23 +02:00
parent 7c3706763a
commit 1d3240ff9c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -97,6 +97,8 @@ information on what to include when reporting a bug.
loader linked statically into the application loader linked statically into the application
- Bugfix: Single compilation unit builds failed due to naming conflicts (#783) - Bugfix: Single compilation unit builds failed due to naming conflicts (#783)
- Bugfix: The range checks for `glfwSetCursorPos` used the wrong minimum (#773) - 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 - [Win32] Bugfix: `glfwSetClipboardString` created an unnecessary intermediate
copy of the string copy of the string
- [Win32] Bugfix: Examples failed to build on Visual C++ 2010 due to C99 in - [Win32] Bugfix: Examples failed to build on Visual C++ 2010 due to C99 in

1
src/internal.h
View File

@ -40,6 +40,7 @@
defined(GLFW_INCLUDE_NONE) || \ defined(GLFW_INCLUDE_NONE) || \
defined(GLFW_INCLUDE_GLEXT) || \ defined(GLFW_INCLUDE_GLEXT) || \
defined(GLFW_INCLUDE_GLU) || \ defined(GLFW_INCLUDE_GLU) || \
defined(GLFW_INCLUDE_VULKAN) || \
defined(GLFW_DLL) defined(GLFW_DLL)
#error "You must not define any header option macros when compiling GLFW" #error "You must not define any header option macros when compiling GLFW"
#endif #endif