[Gnash-commit] gnash ChangeLog libbase/tu_opengl_includes.h

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/01/03 16:45:58

Modified files:
        .              : ChangeLog 
        libbase        : tu_opengl_includes.h 

Log message:
        Make building against X11/OpenGL work
                  even when we're using MACH, i.e. on OSX, but only when the 
GTK GUI
                  is used. (Because there's a good chance we're using X11 when 
GTK is
                  involved; however, there is an experimental GTK/Cocoa port, 
so this
                  is not a definitive fix and we may have to revisit this issue 
some
                  day.) To do this, all we have to do is to make sure GL/glx.h 
is
                  included.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2040&r2=1.2041
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_opengl_includes.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -b -r1.2040 -r1.2041
--- ChangeLog   3 Jan 2007 15:18:35 -0000       1.2040
+++ ChangeLog   3 Jan 2007 16:45:58 -0000       1.2041
@@ -1,3 +1,13 @@
+2007-01-03 Bastiaan Jacques <address@hidden>
+
+       * libbase/tu_opengl_includes.h: Make building against X11/OpenGL work
+         even when we're using MACH, i.e. on OSX, but only when the GTK GUI
+         is used. (Because there's a good chance we're using X11 when GTK is
+         involved; however, there is an experimental GTK/Cocoa port, so this
+         is not a definitive fix and we may have to revisit this issue some
+         day.) To do this, all we have to do is to make sure GL/glx.h is
+         included.
+
 2007-01-03 Ann Barcomb <address@hidden>
 
        * Corrected Firefox version and canvas information 

Index: libbase/tu_opengl_includes.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_opengl_includes.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/tu_opengl_includes.h        29 Oct 2006 23:42:56 -0000      1.12
+++ libbase/tu_opengl_includes.h        3 Jan 2007 16:45:58 -0000       1.13
@@ -66,7 +66,7 @@
 # define APIENTRY
 #endif // __MACH__
 
-#if !defined(WIN32) && !defined(__MACH__)
+#if !defined(WIN32) && (!defined(__MACH__) || defined(GUI_GTK))
 # define GL_GLEXT_PROTOTYPES
 # include <GL/gl.h>
 # include <GL/glx.h>