deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed include order in xwin.c, fixes #13

Browse Source
This commit is contained in:
Jarcode
2018-02-07 17:17:58 -08:00
parent f539f18135
commit 8c3a404f37
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xwin.c
View File

@@ -16,11 +16,16 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#define GLFW_EXPOSE_NATIVE_X11 #define GLFW_EXPOSE_NATIVE_X11
/* Hack to make GLFW 3.1 headers work with GLava. We don't use the context APIs from GLFW, but
the old headers require one of them to be selected for exposure in glfw3native.h. */
#define GLFW_EXPOSE_NATIVE_GLX
#include <glad/glad.h> #include <glad/glad.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
/* Hack to make GLFW 3.1 headers work with GLava. We don't use the context APIs from GLFW, but
the old headers require one of them to be selected for exposure in glfw3native.h. */
#if GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR <= 1
#define GLFW_EXPOSE_NATIVE_GLX
#error "GLX defined"
#endif
#include <GLFW/glfw3native.h> #include <GLFW/glfw3native.h>
#include "render.h" #include "render.h"