Move glext.h to gtkgl.h

diff --git a/src/gtkgl.h b/src/gtkgl.h
index 244bc147b335104215310341e56593dd017cf9a8..c0a8bd6f60bf8de788039f7964c8d397f174a8c5 100644 (file)
--- a/src/gtkgl.h
+++ b/src/gtkgl.h
@@ -27,6 +27,7 @@
 #else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#include <GL/glext.h>
 #endif
 
 /* Call before widget is realized */

diff --git a/src/objects/grits-marker.c b/src/objects/grits-marker.c
index 3bbaf79e4b09ef0749a5f63b019081dbfc665f21..338cf1b76af416d2becffb8b4ed0fa680009b858 100644 (file)
--- a/src/objects/grits-marker.c
+++ b/src/objects/grits-marker.c
@@ -35,10 +35,6 @@
 #include "gtkgl.h"
 #include "grits-marker.h"
 
-#ifdef SYS_WIN
-#include <GL/glext.h>
-#endif
-
 /* Texture setup functions */
 static void render_point(GritsMarker *marker)
 {

diff --git a/src/objects/grits-tile.c b/src/objects/grits-tile.c
index 2b89aea16b51caa15f1607973b43488d81638b96..b566e33496b6ae1b0f4ce4d177d9d2bfcc65bcc8 100644 (file)
--- a/src/objects/grits-tile.c
+++ b/src/objects/grits-tile.c
@@ -32,17 +32,13 @@
  * representing the OpenGL texture to use when drawing the tile.
  */
 
+#define GL_GLEXT_PROTOTYPES
 #include <config.h>
 #include <math.h>
 #include <string.h>
 #include "gtkgl.h"
 #include "grits-tile.h"
 
-#ifdef SYS_WIN
-#define GL_GLEXT_PROTOTYPES
-#include <GL/glext.h>
-#endif
-
 guint  grits_tile_mask = 0;
 
 gchar *grits_tile_path_table[2][2] = {