From: Andy Spencer Date: Thu, 16 Feb 2012 23:04:32 +0000 (+0000) Subject: Move glext.h to gtkgl.h X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=c0b5dcba0863a08d985b5b080ef3191b1c928b04 Move glext.h to gtkgl.h --- diff --git a/src/gtkgl.h b/src/gtkgl.h index 244bc14..c0a8bd6 100644 --- a/src/gtkgl.h +++ b/src/gtkgl.h @@ -27,6 +27,7 @@ #else #include #include +#include #endif /* Call before widget is realized */ diff --git a/src/objects/grits-marker.c b/src/objects/grits-marker.c index 3bbaf79..338cf1b 100644 --- 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 -#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 2b89aea..b566e33 100644 --- 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 #include #include #include "gtkgl.h" #include "grits-tile.h" -#ifdef SYS_WIN -#define GL_GLEXT_PROTOTYPES -#include -#endif - guint grits_tile_mask = 0; gchar *grits_tile_path_table[2][2] = {