From fb1dba2d53eb695f66cb0bcac077ad4fba29962f Mon Sep 17 00:00:00 2001 From: Matevz Tadel <matevz.tadel@cern.ch> Date: Tue, 16 Nov 2010 18:48:09 +0000 Subject: [PATCH] Make multisampling work on mac -- to the first approximation. git-svn-id: http://root.cern.ch/svn/root/trunk@36706 27541ba8-7e3a-0410-8455-c3a389f83636 --- graf3d/gl/inc/TGLWSIncludes.h | 9 ++++++--- graf3d/glew/src/glew.c | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/graf3d/gl/inc/TGLWSIncludes.h b/graf3d/gl/inc/TGLWSIncludes.h index 7056a82c372..23ee50a4324 100644 --- a/graf3d/gl/inc/TGLWSIncludes.h +++ b/graf3d/gl/inc/TGLWSIncludes.h @@ -16,10 +16,13 @@ #include "TGLIncludes.h" -#ifdef WIN32 -#include <GL/wglew.h> +#if defined(WIN32) +# include <GL/wglew.h> #else -#include <GL/glxew.h> +# if defined(__APPLE__) +# define GLEW_APPLE_GLX +# endif +# include <GL/glxew.h> #endif #endif diff --git a/graf3d/glew/src/glew.c b/graf3d/glew/src/glew.c index 7ede4a1511c..bc0fd8d1694 100644 --- a/graf3d/glew/src/glew.c +++ b/graf3d/glew/src/glew.c @@ -29,8 +29,17 @@ ** THE POSSIBILITY OF SUCH DAMAGE. */ +/* ROOT additions begin */ + #define GLEW_BUILD +#if defined(__APPLE__) +# define GLEW_APPLE_GLX +#endif + +/* ROOT additions end */ + + #include <GL/glew.h> #if defined(_WIN32) -- GitLab