From ca4986e82d6eaea52ecd09ccf00a7fe0b5f996f0 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 10 Jun 2020 04:16:46 +0300 Subject: [PATCH] fix GLEW include on OSX --- src/pc/gfx/gfx_opengl.c | 25 ++++++++++--------------- src/pc/gfx/gfx_opengl_legacy.c | 10 +++++----- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/pc/gfx/gfx_opengl.c b/src/pc/gfx/gfx_opengl.c index 9c9cc850..5977e13b 100644 --- a/src/pc/gfx/gfx_opengl.c +++ b/src/pc/gfx/gfx_opengl.c @@ -4,33 +4,28 @@ #include #ifndef _LANGUAGE_C -#define _LANGUAGE_C +# define _LANGUAGE_C #endif #include #ifdef __MINGW32__ -#define FOR_WINDOWS 1 +# define FOR_WINDOWS 1 #else -#define FOR_WINDOWS 0 +# define FOR_WINDOWS 0 #endif -#if FOR_WINDOWS -#define GLEW_STATIC -#include -#include -#define GL_GLEXT_PROTOTYPES 1 -#include +#if FOR_WINDOWS || defined(OSX_BUILD) +# define GLEW_STATIC +# include +#endif -#else #include -#define GL_GLEXT_PROTOTYPES 1 +#define GL_GLEXT_PROTOTYPES 1 #ifdef USE_GLES -#include +# include #else -#include -#endif - +# include #endif #include "../platform.h" diff --git a/src/pc/gfx/gfx_opengl_legacy.c b/src/pc/gfx/gfx_opengl_legacy.c index d97f122d..d64674aa 100644 --- a/src/pc/gfx/gfx_opengl_legacy.c +++ b/src/pc/gfx/gfx_opengl_legacy.c @@ -5,21 +5,21 @@ #include #ifndef _LANGUAGE_C -#define _LANGUAGE_C +# define _LANGUAGE_C #endif #include #ifdef __MINGW32__ -#define FOR_WINDOWS 1 +# define FOR_WINDOWS 1 #else -#define FOR_WINDOWS 0 +# define FOR_WINDOWS 0 #endif #include #if FOR_WINDOWS || defined(OSX_BUILD) -#define GLEW_STATIC -#include +# define GLEW_STATIC +# include #endif #define GL_GLEXT_PROTOTYPES 1