Move OpenGL includes to a common place

Apple seems to think the should put GL.h in OpenGL instead of GL..
putting it all gtkgl.h makes it a little easier, but requires gtkgl.h to
be included in the install and by grits.h.

diff --git a/src/Makefile.am b/src/Makefile.am
index 18659d3df686f0e17a3060c989e530933636dd46..ed3db864219340946ccdcd2cb895b007a7b59768 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ grits_include_HEADERS = \
        grits-opengl.h  \
        grits-plugin.h  \
        grits-util.h    \
+       gtkgl.h         \
        gpqueue.h       \
        roam.h
 

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 59fea09edccd9443b5bb1a25dc47aa29bf20d668..a39fbda1733f87d8f55c9c8b1b354b00cabeb8ba 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -32,8 +32,6 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 
 #include "grits-opengl.h"
 #include "grits-util.h"

diff --git a/src/grits.h b/src/grits.h
index 84ae7edbbdfcac66ffb9a6749a6402caa4139207..523d87c9c3802efc58c0d03776e28ccfaa554f89 100644 (file)
--- a/src/grits.h
+++ b/src/grits.h
@@ -40,4 +40,7 @@
 /* Plugins */
 #include <grits-plugin.h>
 
+/* Misc */
+#include <gtkgl.h>
+
 #endif

diff --git a/src/gtkgl.h b/src/gtkgl.h
index 174fc7674dda93d0128e4d9f805f737f518d2236..71ad67a7739c3426e2d80df535e233d906c88e13 100644 (file)
--- a/src/gtkgl.h
+++ b/src/gtkgl.h
@@ -18,6 +18,17 @@
 #ifndef __GTK_GL_H__
 #define __GTK_GL_H__
 
+#include <gtk/gtk.h>
+
+/* Platform dependant OpenGL includes */
+#ifdef USE_MAC
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
+
 /* Call before widget is realized */
 void gtk_gl_enable(GtkWidget *widget);
 

diff --git a/src/objects/grits-marker.c b/src/objects/grits-marker.c
index a5cb9c719e3c6d7753bd04c98b15a3eb7ff7a13c..3946775d22932dc593d75bca547f80f1f562884b 100644 (file)
--- a/src/objects/grits-marker.c
+++ b/src/objects/grits-marker.c
@@ -31,7 +31,7 @@
  */
 
 #include <config.h>
-#include <GL/gl.h>
+#include "gtkgl.h"
 #include "grits-marker.h"
 
 /**

diff --git a/src/objects/grits-object.c b/src/objects/grits-object.c
index 30f79f9412850d1f828503cf4e56ce55460945a9..fc8cddf2789135b52110e415bd1fe209c3d2df40 100644 (file)
--- a/src/objects/grits-object.c
+++ b/src/objects/grits-object.c
@@ -30,8 +30,8 @@
 
 #include <config.h>
 #include <math.h>
-#include <GL/gl.h>
 
+#include "gtkgl.h"
 #include "grits-object.h"
 
 /* Constants */

diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 67dca9a9156302f1fe84c83f55c376dfc0529d60..5d54a70da80d06d6f22ff2939c03d97af2421f44 100644 (file)
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -23,8 +23,7 @@
  */
 
 #include <config.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include "gtkgl.h"
 #include "grits-poly.h"
 
 /* Drawing */

diff --git a/src/objects/grits-tile.c b/src/objects/grits-tile.c
index bceb2a3dd1eeeb399ffe4519683c92ab1fe2042d..c8326daeb5ec998d17694c96e288d115e7abce7e 100644 (file)
--- a/src/objects/grits-tile.c
+++ b/src/objects/grits-tile.c
@@ -33,7 +33,7 @@
  */
 
 #include <config.h>
-#include <GL/gl.h>
+#include "gtkgl.h"
 #include "grits-tile.h"
 
 gchar *grits_tile_path_table[2][2] = {

diff --git a/src/objects/grits-volume.c b/src/objects/grits-volume.c
index 2579600046dc1575afb0f95aa01d9a1582d20686..f972fe5c2255c5340447dcaa6694a4d7213740af 100644 (file)
--- a/src/objects/grits-volume.c
+++ b/src/objects/grits-volume.c
@@ -29,7 +29,7 @@
 #include <config.h>
 #include <math.h>
 #include <glib.h>
-#include <GL/gl.h>
+#include "gtkgl.h"
 #include "grits-volume.h"
 
 /* Drawing */

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index cf3f3fbe0b677b3d6b1d584a5a40bec83af22cc2..d8c645610a1ce6c0418a4b2c14a7140ab0177766 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -26,7 +26,6 @@
  */
 
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 

diff --git a/src/plugins/env.c b/src/plugins/env.c
index cdafb5c2d249223daabc5525a251ad9fcf2ef94e..75e41d3899de350c9817483d03c3e7ec6b10869b 100644 (file)
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -25,7 +25,6 @@
  */
 
 #include <math.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 31412d2dc249e8f99a5cfd13ad30f3dbefd72ee3..0e8a656eca7a10a344a232ba03276a4f8e16daa2 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -25,7 +25,6 @@
 
 #include <time.h>
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 0640c52660530f3084e1d13af795c532d64cb1a7..1c738d90c620ad0f31caacb65b567bee71b1e20a 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -25,7 +25,6 @@
 
 #include <time.h>
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 2c11ea9ec28e4ec2cfa1f017692b0d9a0833eb3f..d0315bd7f6e9552b65002213fce49d17f9486772 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -25,9 +25,6 @@
 
 #include <string.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 #include <gdk/gdkkeysyms.h>
 #include <grits.h>
 

diff --git a/src/roam.c b/src/roam.c
index 69c75f2c332a6c326dd02f6322de2f57bf8b4018..cfcdd54d0328be9d8258cca25ba92df293581287 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -31,9 +31,8 @@
 #include <glib.h>
 #include <math.h>
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
 
+#include "gtkgl.h"
 #include "gpqueue.h"
 #include "grits-util.h"
 #include "roam.h"