From: Brendan Shanks bshanks@codeweavers.com
--- dlls/winemac.drv/macdrv.h | 10 ++++++++++ dlls/winemac.drv/opengl.c | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 6111577c02c..255e45cc3f3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -67,6 +67,16 @@ */ #define BOOL DoNotUseBOOLInThisFile
+/* Include OpenGL here to avoid typedef conflicts between Windows wgl and OpenGL.framework */ +#define GL_SILENCE_DEPRECATION +#define __gl_h_ +#define __gltypes_h_ +#include <OpenGL/OpenGL.h> +#include <OpenGL/gl.h> +#include <OpenGL/glext.h> +#include <OpenGL/glu.h> +#include <OpenGL/CGLRenderers.h> +
extern bool allow_vsync; extern bool allow_set_gamma; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index c84be256cf1..5f47f629f7b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -26,12 +26,6 @@ #include "config.h" #include "macdrv.h"
-#define GL_SILENCE_DEPRECATION -#define __gl_h_ -#define __gltypes_h_ -#include <OpenGL/OpenGL.h> -#include <OpenGL/glu.h> -#include <OpenGL/CGLRenderers.h> #include <dlfcn.h>
WINE_DEFAULT_DEBUG_CHANNEL(wgl);