haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence warnings on MacOS about OpenGL deprecation 

Apple has apparently deprecated OpenGL and replaced it with
their Metal API. It still works for now though.
This commit is contained in:
Ian McInerney 2019-12-28 16:05:03 +00:00
parent d5b8e4928c
commit 6faa2188ed
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3d-viewer/common_ogl/openGL_includes.h
View File

@ -33,6 +33,9 @@
#include <wx/wx.h> #include <wx/wx.h>
#ifdef __APPLE__ #ifdef __APPLE__
// Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated.
// Luckily we can silence warnings about its deprecation.
#define GL_SILENCE_DEPRECATION 1
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else

6
common/gal/opengl/opengl_gal.cpp
View File

@ -26,6 +26,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
// Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated.
// Luckily we can silence warnings about its deprecation.
#ifdef __APPLE__
#define GL_SILENCE_DEPRECATION 1
#endif
#include <gal/opengl/opengl_gal.h> #include <gal/opengl/opengl_gal.h>
#include <gal/opengl/utils.h> #include <gal/opengl/utils.h>
#include <gal/definitions.h> #include <gal/definitions.h>

5
utils/idftools/vrml_layer.h
View File

@ -35,6 +35,11 @@
#ifndef VRML_LAYER_H #ifndef VRML_LAYER_H
#define VRML_LAYER_H #define VRML_LAYER_H
// Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated.
// Luckily we can silence warnings about its deprecation.
#ifdef __APPLE__
#define GL_SILENCE_DEPRECATION 1
#endif
#include <wx/glcanvas.h> // CALLBACK definition, needed on Windows #include <wx/glcanvas.h> // CALLBACK definition, needed on Windows
// alse needed on OSX to define __DARWIN__ // alse needed on OSX to define __DARWIN__