Changeset 39206 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Nov 4, 2011 3:16:16 PM (13 years ago)

Author:

vboxsync

Message:

Made OpenGL build against the Mac OS X 10.7 SDK. Some cleanups.

File:

• trunk/src/VBox/GuestHost/OpenGL/include/GL/glext.h (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/GL/glext.h

@@ -3718 +3718 @@
 #endif
 
+/* VBox: HACK ALERT! When building the host side against Mac OS X 10.7 headers,
+   /Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gltypes.h
+   is included and it typedefs GLhandleARB differently.  In 10.6 and earlier,
+   gl.h was included instead of gltypes.h (new file) avoiding the conflicting
+   typedef in Headers/glext.h.
+
+   Since sizeof the gltypes.h typedef is 64-bit on 64-bit platforms, we're in
+   trouble if the type is used for anything important.  Fortunately, the
+   conflict only occurs in three files: renderspu_config.c, renderspu_cocoa.c
+   and renderspu_cocoa_helper.m. */
+#ifdef RT_OS_DARWIN
+# ifndef MAC_OS_X_VERSION_MIN_REQUIRED
+#  error "MAC_OS_X_VERSION_MIN_REQUIRED is not defined"
+# endif
+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && defined(__gltypes_h_)
+#  define GLhandleARB VBoxGLhandleARB
+# endif
+#endif
+
 #ifndef GL_ARB_shader_objects
 /* GL types for handling shader object handles and program/shader text */