Merge branch 'master' into docking

This commit is contained in:
omar
2019-02-12 10:30:48 +01:00
4 changed files with 9 additions and 4 deletions

View File

@@ -46,6 +46,7 @@
#define WINGDIAPI __declspec(dllimport) // Some Windows OpenGL headers need this
#endif
#if defined(__APPLE__)
#define GL_SILENCE_DEPRECATION
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>