Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some incompatibilities between google3/third_party/GL,EGL, glad

Browse Source
This commit is contained in:
Erwin Coumans
2018-05-03 09:06:30 -07:00
parent 4a8ad1a54e
commit 0c706eb08a
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/OpenGLWindow/OpenGL2Include.h
View File

@@ -17,12 +17,20 @@ subject to the following restrictions:
#ifndef __OPENGL_INCLUDE_H
#define __OPENGL_INCLUDE_H
#ifdef BT_NO_GLAD
#include "third_party/GL/gl/include/EGL/egl.h"
#include "third_party/GL/gl/include/EGL/eglext.h"
#include "third_party/GL/gl/include/GL/gl.h"
#else
#ifdef B3_USE_GLFW
#include "glad/glad.h"
#include <GLFW/glfw3.h>
#else
#include "glad/glad.h"
#endif //B3_USE_GLFW
#endif //BT_NO_GLAD
//disable glGetError
//#undef glGetError
//#define glGetError MyGetError