caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-08-27 13:05:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow combining Vulkan and GL/GLES header macros

Browse Source
This commit is contained in:
Camilla Berglund
2016-09-14 21:13:33 +02:00
parent 7e9e321c38
commit 433db8f9f9
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/GLFW/glfw3.h
View File

@@ -165,8 +165,6 @@ extern "C" {
#if defined(GLFW_INCLUDE_GLEXT)
#include <GLES2/gl2ext.h>
#endif
#elif defined(GLFW_INCLUDE_VULKAN)
#include <vulkan/vulkan.h>
#elif !defined(GLFW_INCLUDE_NONE)
#include <GL/gl.h>
#if defined(GLFW_INCLUDE_GLEXT)
@@ -177,6 +175,9 @@ extern "C" {
#include <GL/glu.h>
#endif
#endif
#if defined(GLFW_INCLUDE_VULKAN)
#include <vulkan/vulkan.h>
#endif
#if defined(GLFW_DLL) && defined(_GLFW_BUILD_DLL)
/* GLFW_DLL must be defined by applications that are linking against the DLL