Add in potential Mac OS adjustments to make the PGE run with OpenGL3.3 flag.
This commit is contained in:
parent
9005771f77
commit
48b6b7559b
@ -1466,10 +1466,14 @@ namespace X11 {
|
|||||||
|
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
#define GL_SILENCE_DEPRECATION
|
#define GL_SILENCE_DEPRECATION
|
||||||
#include <OpenGL/OpenGL.h>
|
|
||||||
#include <OpenGL/gl.h>
|
|
||||||
#include <OpenGL/glu.h>
|
|
||||||
#define CALLSTYLE
|
#define CALLSTYLE
|
||||||
|
#define OGL_LOAD(t, n) n;
|
||||||
|
#define GL_GLEXT_PROTOTYPES
|
||||||
|
#include <OpenGL/OpenGL.h>
|
||||||
|
#include <OpenGl/gl3ext.h>
|
||||||
|
#include <OpenGL/gl3.h>
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#include <OpenGL/gltypes.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(OLC_PLATFORM_EMSCRIPTEN)
|
#if defined(OLC_PLATFORM_EMSCRIPTEN)
|
||||||
@ -1529,10 +1533,18 @@ namespace olc
|
|||||||
#if defined(OLC_PLATFORM_EMSCRIPTEN)
|
#if defined(OLC_PLATFORM_EMSCRIPTEN)
|
||||||
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
|
||||||
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, EGLint interval);
|
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, EGLint interval);
|
||||||
#else
|
|
||||||
#ifndef OLC_GFX_HEADLESS
|
|
||||||
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
typedef int EGLBoolean;
|
||||||
|
typedef int32_t EGLint;
|
||||||
|
typedef void *EGLDisplay;
|
||||||
|
typedef void *EGLConfig;
|
||||||
|
typedef void *EGLSurface;
|
||||||
|
typedef void *EGLContext;
|
||||||
|
|
||||||
|
typedef EGLBoolean(locSwapInterval_t)(EGLDisplay display, GLint interval);
|
||||||
|
typedef void CALLSTYLE locShaderSource_t(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // olc namespace
|
} // olc namespace
|
||||||
|
Loading…
x
Reference in New Issue
Block a user