[grits] Move glext.h to gtkgl.h
- From: Andy Spencer <andys src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grits] Move glext.h to gtkgl.h
- Date: Thu, 16 Feb 2012 23:19:50 +0000 (UTC)
commit c0b5dcba0863a08d985b5b080ef3191b1c928b04
Author: Andy Spencer <andy753421 gmail com>
Date: Thu Feb 16 23:04:32 2012 +0000
Move glext.h to gtkgl.h
src/gtkgl.h | 1 +
src/objects/grits-marker.c | 4 ----
src/objects/grits-tile.c | 6 +-----
3 files changed, 2 insertions(+), 9 deletions(-)
---
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 <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 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 <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 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 <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] = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]