It seems like there's conflicting types for GLhandleARB, one defined by Wine, the other by OS X, on Mountain Lion. I assume that the #define __gl_h_ is a try to work around the issue, but OS X's gltypes.h still gets included. On Mar 6, 2013, at 3:59 AM, Ken Thomases ken@codeweavers.com wrote:
dlls/winemac.drv/Makefile.in | 4 +- dlls/winemac.drv/cocoa_opengl.h | 32 + dlls/winemac.drv/cocoa_opengl.m | 154 ++++ dlls/winemac.drv/cocoa_window.m | 187 ++++ dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 10 + dlls/winemac.drv/macdrv_cocoa.h | 15 + dlls/winemac.drv/opengl.c | 1912 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 11 +- 9 files changed, 2322 insertions(+), 5 deletions(-) create mode 100644 dlls/winemac.drv/cocoa_opengl.h create mode 100644 dlls/winemac.drv/cocoa_opengl.m create mode 100644 dlls/winemac.drv/opengl.c
<0001-winemac-Implement-OpenGL-support.patch>
On Mar 6, 2013, at 1:58 PM, C.W. Betts wrote:
It seems like there's conflicting types for GLhandleARB, one defined by Wine, the other by OS X, on Mountain Lion. I assume that the #define __gl_h_ is a try to work around the issue, but OS X's gltypes.h still gets included.
Ugh. Thanks for letting me know. I'll have to investigate. I'm not well set up to build against later SDKs at the moment, but I'll see what I can do. Of course, if you can figure out a solution, that would be great.
-Ken
It looks like if GL_ARB_shader_objects is defined, then the OS X GLhandleARB isn't typedef'd. On Mar 6, 2013, at 1:16 PM, Ken Thomases ken@codeweavers.com wrote:
On Mar 6, 2013, at 1:58 PM, C.W. Betts wrote:
It seems like there's conflicting types for GLhandleARB, one defined by Wine, the other by OS X, on Mountain Lion. I assume that the #define __gl_h_ is a try to work around the issue, but OS X's gltypes.h still gets included.
Ugh. Thanks for letting me know. I'll have to investigate. I'm not well set up to build against later SDKs at the moment, but I'll see what I can do. Of course, if you can figure out a solution, that would be great.
-Ken
On Mar 7, 2013, at 9:39 AM, C.W. Betts wrote:
It looks like if GL_ARB_shader_objects is defined, then the OS X GLhandleARB isn't typedef'd.
I think a better approach is to define __gltypes_h_ just to no-op that whole header. Does that fix compilation for you? If so, please submit it as a patch.
Thanks, Ken
-
C.W. Betts -
Ken Thomases