Fixes how glext header is included.
This commit fixes the issue caused by #357 that nanovg failed to compile on iOS due to the wrong way of including glext header.master
parent
51284049e2
commit
4ac2b44ea7
|
@ -20,6 +20,7 @@
|
|||
#ifdef NANOVG_GLEW
|
||||
# include <GL/glew.h>
|
||||
#endif
|
||||
#define GLFW_INCLUDE_GLEXT
|
||||
#include <GLFW/glfw3.h>
|
||||
#include "nanovg.h"
|
||||
#define NANOVG_GL2_IMPLEMENTATION
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#ifdef __APPLE__
|
||||
# define GLFW_INCLUDE_GLCOREARB
|
||||
#endif
|
||||
#define GLFW_INCLUDE_GLEXT
|
||||
#include <GLFW/glfw3.h>
|
||||
#include "nanovg.h"
|
||||
#define NANOVG_GL3_IMPLEMENTATION
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#define GLFW_INCLUDE_ES2
|
||||
#define GLFW_INCLUDE_GLEXT
|
||||
#include <GLFW/glfw3.h>
|
||||
#include "nanovg.h"
|
||||
#define NANOVG_GLES2_IMPLEMENTATION
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#define GLFW_INCLUDE_ES3
|
||||
#define GLFW_INCLUDE_GLEXT
|
||||
#include <GLFW/glfw3.h>
|
||||
#include "nanovg.h"
|
||||
#define NANOVG_GLES3_IMPLEMENTATION
|
||||
|
|
|
@ -113,10 +113,6 @@ enum NVGimageFlagsGL {
|
|||
#include <math.h>
|
||||
#include "nanovg.h"
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <OpenGL/glext.h>
|
||||
#endif
|
||||
|
||||
enum GLNVGuniformLoc {
|
||||
GLNVG_LOC_VIEWSIZE,
|
||||
GLNVG_LOC_TEX,
|
||||
|
|
Loading…
Reference in New Issue