Re: [Celestia-developers] glext.h warnings on Mac OS X

[Chris L. <cl...@gm...>]

DW,

Sorry about the MacOSX mixup. Please commit this patch.

--Chris

On Dec 31, 2007 7:56 AM, Da Woon Jung <dir...@gm...> wrote:

> The latest change to Celestia's glext.h (EXT_texture_cube_map ->
> ARB_texture_cube_map) causes a lot of compilation warnings on Mac OS
> X, due to symbol redefinition. ARB_texture_cube_map and its relevant
> symbols have in fact been defined in OS X's glext.h since at least
> 10.2.8 so the MACOSX-conditional isn't needed. Here is a patch (note:
> I also corrected the stray "EXT_texture_cube_map" in the comment):
>
> Index: glext.h
> ===================================================================
> RCS file: /cvsroot/celestia/celestia/src/celengine/glext.h,v
> retrieving revision 1.22
> diff -u -r1.22 glext.h
> --- glext.h     30 Dec 2007 19:11:25 -0000      1.22
> +++ glext.h     31 Dec 2007 15:53:53 -0000
> @@ -141,8 +141,8 @@
>     extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB;
>  };
>
> -/* EXT_texture_cube_map defines from <GL/gl.h> */
> -#if !(defined( GL_ARB_texture_cube_map) || defined(__glext_h_)) ||
> defined(MACOSX)
> +/* ARB_texture_cube_map defines from <GL/gl.h> */
> +#if !(defined( GL_ARB_texture_cube_map) || defined(__glext_h_))
>  #define GL_NORMAL_MAP_ARB                   ((GLenum) 0x8511)
>  #define GL_REFLECTION_MAP_ARB               ((GLenum) 0x8512)
>  #define GL_TEXTURE_CUBE_MAP_ARB             ((GLenum) 0x8513)
>