Abstract out location of gl.h, glut.h, and glu.h includes so that we can

make the Mac platform happy since they put these in a different place compared
to the rest of the world.

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 9123ab19729285723002a510378ddf1fefd99e65..b6ae6c7d40322d50a37daeb27f6eaaa417d75b86 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -364,6 +364,23 @@
 
 #endif // __ICC
 
+//
+// Platform dependent gl.h and glut.h definitions
+//
+
+#ifdef __APPLE__
+#  define SG_GL_H <OpenGL/gl.h>
+#  define SG_GLU_H <OpenGL/glu.h>
+#  define SG_GLUT_H <OpenGL/glut.h>
+#  define SG_GLEXT_H <OpenGL/glext.h>
+#else
+#  define SG_GL_H <GL/gl.h>
+#  define SG_GLU_H <GL/glu.h>
+#  define SG_GLUT_H <GL/glut.h>
+#  define SG_GLEXT_H <GL/glext.h>
+#endif
+
+
 //
 // No user modifiable definitions beyond here.
 //

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 22309400ad5302d69a4312c20a858b5890b61b92..f73687d3b8976ae8d8c95e7b2be9d604981fbfa8 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -33,12 +33,12 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
-
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/structure/exception.hxx>
 
+#include SG_GL_H
+
 #include <string.h>
 #include STL_STRING
 

diff --git a/simgear/scene/sky/clouds3d/SkyCloud.cpp b/simgear/scene/sky/clouds3d/SkyCloud.cpp
index 0155de421a107f51a2b388f84a1893c9a652ee15..59243c38c894c56e68604e611b993b5eb9d8a955 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyCloud.cpp
@@ -33,9 +33,12 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
 #include <plib/ul.h>
 
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
+
 #include "SkyCloud.hpp"
 #include "SkyRenderableInstance.hpp" 
 #include "SkyContext.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp b/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
index d76dd559bbda7328481c7b2ec8ecaa776017c710..a23ab69d2570a3e1feb8d0ee6aeb273664108a52 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
+++ b/simgear/scene/sky/clouds3d/SkyDynamicTextureManager.hpp
@@ -36,7 +36,9 @@
 
 #include <map>
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "SkyUtil.hpp"
 #include "SkySingleton.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyLight.cpp b/simgear/scene/sky/clouds3d/SkyLight.cpp
index 59553cfb953f5739bf93f3c6b9143ef9afc89d66..0efbe4f569be577da7f5e388dcae988c6a85d9c5 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyLight.cpp
+++ b/simgear/scene/sky/clouds3d/SkyLight.cpp
@@ -28,7 +28,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include "glut_shapes.h"
 

diff --git a/simgear/scene/sky/clouds3d/SkyMaterial.hpp b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
index 84573558a811f438e4e07d1cc12461b03a7d91dd..ef6c07bb52f55dbac671214863b82cce99bce657 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMaterial.hpp
+++ b/simgear/scene/sky/clouds3d/SkyMaterial.hpp
@@ -33,7 +33,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "vec4f.hpp"
 #include "SkyUtil.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp b/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
index 41b2cf3b339931ec26fb0f4ce5e0bd7abb3e4858..8d0088220f45450bda3e5f0ea9a582876e1a1503 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
+++ b/simgear/scene/sky/clouds3d/SkyMinMaxBox.cpp
@@ -29,7 +29,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "SkyMinMaxBox.hpp"
 #include "camutils.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
index a436a7dace73280ec5b94cec5d8c058978f3710c..268aa038e1ef3546efc972f12b4e39d270992f01 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
@@ -28,7 +28,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include "SkyUtil.hpp"
 #include "SkyCloud.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
index 87b7f55918c175e8aca4f64daee39ed8b6c4a958..6206de7db19628b14865b8757b8cb98c0d3f8d3d 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceGroup.cpp
@@ -30,7 +30,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "SkyRenderableInstanceGroup.hpp"
 #include "SkySceneManager.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyTexture.hpp b/simgear/scene/sky/clouds3d/SkyTexture.hpp
index e5dd96d81ebe874d0f7236e9df33096343139615..bc18739d14d2f151605f3e55bd02ef22a35c8c7a 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTexture.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTexture.hpp
@@ -33,7 +33,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #define __glext_h_
 #define __GLEXT_H_

diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
index 9d123b5cbd986cddde190cccdc85b8add15e0f8a..9532f8ef64d7025688824109512749d85d6ff9a0 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
@@ -30,7 +30,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include "SkyTextureManager.hpp"
 #include "SkyContext.hpp"

diff --git a/simgear/scene/sky/clouds3d/glut_shapes.c b/simgear/scene/sky/clouds3d/glut_shapes.c
index e8796cf475f82c140a3fa42c7ecd69a73208f92b..a917cc679d448ab8272715d7d46b87d82544ac42 100644 (file)
--- a/simgear/scene/sky/clouds3d/glut_shapes.c
+++ b/simgear/scene/sky/clouds3d/glut_shapes.c
@@ -48,10 +48,13 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
 #  include <simgear_config.h>
 #endif
 
-#include "glut_shapes.h"
-
 #include <math.h>
-#include <GL/glu.h>
+
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
+
+#include "glut_shapes.h"
 
 
 /* Some <math.h> files do not define M_PI... */

diff --git a/simgear/scene/sky/clouds3d/glut_shapes.h b/simgear/scene/sky/clouds3d/glut_shapes.h
index 5c5ff39ba774c948cbcfa346f8bd060ae492590e..e364c6c4797bd6dfbab9692200e32f0dc0f4d9d3 100644 (file)
--- a/simgear/scene/sky/clouds3d/glut_shapes.h
+++ b/simgear/scene/sky/clouds3d/glut_shapes.h
@@ -14,7 +14,9 @@
 # include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx
index 4084c09b41609a22c4343a012300e11c1b4c3667..24396544472fba80fc03fcf6d59224013be18087 100644 (file)
--- a/simgear/scene/sky/dome.cxx
+++ b/simgear/scene/sky/dome.cxx
@@ -33,7 +33,9 @@
 
 #include <math.h>
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include <plib/sg.h>
 

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 7caba76d46287819ae165a6f395f0448f1f9ab04..a490a4d0bdc3ff4262bee9b079c1093e98406d5b 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -15,7 +15,9 @@
 #include <limits.h>
 #include <string.h>            // memcpy()
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "GLBitmaps.h"
 

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index 30f63e214ac2a112ba33d574113e20fe624626b3..4b9046a0c1e6316996d260cef51190924b5670de 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -36,7 +36,9 @@
 # include <dlfcn.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 
 #if defined(__cplusplus)

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index d6a62ba05b48e95160c25355e2610408d5316aff..ce4b5c45ff1e5bcb9fa8718382c1a6ba9144b80c 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -36,7 +36,9 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "screen-dump.hxx"
 

diff --git a/simgear/screen/screen-dump.hxx b/simgear/screen/screen-dump.hxx
index 876d236a3a67bfd2c4fe97ef02fba878e7a10521..7c2e922d9390391a7d97178b754e72434d77a012 100644 (file)
--- a/simgear/screen/screen-dump.hxx
+++ b/simgear/screen/screen-dump.hxx
@@ -22,8 +22,9 @@
 //
 // $Id$
 
+#include <simgear/compiler.h>
 
-#include <GL/gl.h>
+#include SG_GL_H
 
 /**
  * Dump the screen buffer to a ppm file.

diff --git a/simgear/screen/texture.cxx b/simgear/screen/texture.cxx
index e3331a747c64bbdccb83182ab476d2aeb1df4e1c..4404786a7da7516c782bc408c2002093fe193665 100644 (file)
--- a/simgear/screen/texture.cxx
+++ b/simgear/screen/texture.cxx
@@ -12,10 +12,13 @@
  */
 
 #include <simgear/compiler.h>
+
 #ifdef WIN32
 # include <windows.h>
 #endif
-#include <GL/glu.h>
+
+#include SG_GLU_H
+
 #include <zlib.h>
 
 #include "texture.hxx"

diff --git a/simgear/screen/texture.hxx b/simgear/screen/texture.hxx
index 22f1f01c27d05f60396cc3258d904bd7f9f602e4..5b7c777b72bbae1c4c04bd57b49db04e12fe5ef5 100644 (file)
--- a/simgear/screen/texture.hxx
+++ b/simgear/screen/texture.hxx
@@ -13,7 +13,8 @@
 #ifndef __SG_TEXTURE_HXX
 #define __SG_TEXTURE_HXX 1
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+#include SG_GL_H
 #include <zlib.h>
 
 #include <plib/sg.h>

diff --git a/simgear/screen/tr.cxx b/simgear/screen/tr.cxx
index 393213b4216cf332d40aa42f5a7796d8f272aa5b..16841094e1976fd609b94369a1cbf489a3d556b1 100644 (file)
--- a/simgear/screen/tr.cxx
+++ b/simgear/screen/tr.cxx
@@ -2,8 +2,13 @@
 
 /*
  * $Log$
- * Revision 1.1  2002/09/07 02:58:19  curt
- * Initial revision
+ * Revision 1.2  2004/11/18 19:10:34  curt
+ * Abstract out location of gl.h, glut.h, and glu.h includes so that we can
+ * make the Mac platform happy since they put these in a different place compared
+ * to the rest of the world.
+ *
+ * Revision 1.1.1.1  2002/09/07 02:58:19  curt
+ * Initial revsion of Simgear-0.3.0
  *
  * Revision 1.3  2001/07/30 20:34:21  curt
  * Various MSVC fixes.
@@ -62,8 +67,9 @@
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include <GL/gl.h>
-#include <GL/glu.h>
+
+#include SG_GLU_H
+
 #include <plib/ssg.h>
 #include "tr.h"
 

diff --git a/simgear/screen/tr.h b/simgear/screen/tr.h
index 5224786b2b510a126e7205edae59a041a779e5d7..e276b5db01a154daec32cb9d682abf76cbc3e321 100644 (file)
--- a/simgear/screen/tr.h
+++ b/simgear/screen/tr.h
@@ -2,8 +2,13 @@
 
 /*
  * $Log$
- * Revision 1.1  2002/09/07 02:58:19  curt
- * Initial revision
+ * Revision 1.2  2004/11/18 19:10:34  curt
+ * Abstract out location of gl.h, glut.h, and glu.h includes so that we can
+ * make the Mac platform happy since they put these in a different place compared
+ * to the rest of the world.
+ *
+ * Revision 1.1.1.1  2002/09/07 02:58:19  curt
+ * Initial revsion of Simgear-0.3.0
  *
  * Revision 1.1  2001/06/26 15:19:39  curt
  * Added tr.cxx / tr.h, Brian Paul's LGPL'd tiled rendering support libs for
@@ -75,8 +80,9 @@
 #ifndef TR_H
 #define TR_H
 
+#include <simgear/compiler.h>
 
-#include <GL/gl.h>
+#include SG_GL_H
 
 
 //#ifdef __cplusplus

diff --git a/simgear/xgl/xgl.h b/simgear/xgl/xgl.h
index 40a14fbfe97fd37573236f4acf5283bb6317aad9..bb3712477e09f9b423ba86a48cd0dc4d50de100b 100644 (file)
--- a/simgear/xgl/xgl.h
+++ b/simgear/xgl/xgl.h
@@ -14,8 +14,10 @@
 # include <windows.h>
 #endif
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+#include SG_GLU_H
+#include SG_GL_H
+
 #include <stdio.h>