- remove the SG_GLxxxx_H #defines, since OSG provides its own versions

 - this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x

Issues:

 - the logic for X11 and Win32 in RenderTexture and extensions is tortured,
   please see if you agree I got all the ifdefs correct.

diff --git a/simgear/compiler.h b/simgear/compiler.h
index beb409fdacfcec62cba97001a27708393fdc2925..7d2e6da572995c0ec59253d6bbdd9ea5b234e360 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -131,20 +131,9 @@
 //
 
 #ifdef __APPLE__
-#  define SG_GL_H <OpenGL/gl.h>
-#  define SG_GLX_H <AGL/agl.h>
-#  define SG_GLU_H <OpenGL/glu.h>
-#  define SG_GLEXT_H <OpenGL/glext.h>
-#  define SG_GLUT_H <GLUT/glut.h>
-
-
 inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 #else
-#  define SG_GL_H <GL/gl.h>
-#  define SG_GLX_H <GL/glx.h>
-#  define SG_GLU_H <GL/glu.h>
-#  define SG_GLEXT_H <GL/glext.h>
-#  define SG_GLUT_H <GL/glut.h>
+
 #endif
 
 

diff --git a/simgear/scene/model/shadowvolume.cxx b/simgear/scene/model/shadowvolume.cxx
index 970fe3e7f4bc5decae7928bc1b37560817adee8d..3a164a16509772653f7cc529af31c355fbe92ade 100644 (file)
--- a/simgear/scene/model/shadowvolume.cxx
+++ b/simgear/scene/model/shadowvolume.cxx
@@ -30,7 +30,7 @@
 #include <simgear/scene/model/animation.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/environment/visual_enviro.hxx>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "shadowvolume.hxx"
 

diff --git a/simgear/scene/sky/bbcache.cxx b/simgear/scene/sky/bbcache.cxx
index 420b0e8d037428062a732455b6dbc4deefcb5127..66b272750fc990337d0ac9cda689b1c0dec6bffd 100644 (file)
--- a/simgear/scene/sky/bbcache.cxx
+++ b/simgear/scene/sky/bbcache.cxx
@@ -30,7 +30,7 @@
 #include <plib/sg.h>
 #include <simgear/screen/extensions.hxx>
 #include <simgear/screen/RenderTexture.h>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "bbcache.hxx"
 

diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx
index d15b456109a90653f194e87b751137b2a2172c63..9eb5d20d540ee915fa29ce2a1dfa07891bdf7c64 100644 (file)
--- a/simgear/scene/sky/newcloud.cxx
+++ b/simgear/scene/sky/newcloud.cxx
@@ -34,7 +34,7 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include <algorithm>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "cloudfield.hxx"
 #include "newcloud.hxx"

diff --git a/simgear/screen/GLBitmaps.h b/simgear/screen/GLBitmaps.h
index f6fb05f424a28bc1ac9aa490e760175b80aff7b7..bc92e33d920011659339282c8d3bba9c509613ed 100644 (file)
--- a/simgear/screen/GLBitmaps.h
+++ b/simgear/screen/GLBitmaps.h
@@ -1,6 +1,6 @@
 #include <simgear/compiler.h>
 
-#include SG_GL_H
+#include <osg/GL>
 
 class GlBitmap
 {

diff --git a/simgear/screen/RenderTexture.cpp b/simgear/screen/RenderTexture.cpp
index ec6a8e899e3c80097a04f3913f1482fe2114eab1..0e5ba9ef6156d0b60fca9f2a03ec363f8953e544 100644 (file)
--- a/simgear/screen/RenderTexture.cpp
+++ b/simgear/screen/RenderTexture.cpp
@@ -496,7 +496,7 @@ bool RenderTexture::Initialize(int width, int height,
         fprintf(stderr, "Couldn't get current context!");
    
         CGLPixelFormatObj pixFormat = NULL;
-        long int iNumFormats;
+        GLint iNumFormats;
         CGLError error;
 
         // Copy the _pixelFormatAttribs into another array to fix
@@ -553,7 +553,7 @@ bool RenderTexture::Initialize(int width, int height,
            return false;
        }
 
-       long screen;
+       GLint screen;
        if (error = CGLGetVirtualScreen(CGLGetCurrentContext(), &screen))
        {
            _cglCheckError(error);

diff --git a/simgear/screen/RenderTexture.h b/simgear/screen/RenderTexture.h
index 5d68a02c698d6b076fd506f646b4ead417b02f01..a1874fbc8aac90ffe37311e1e24eef7485f6b9e4 100644 (file)
--- a/simgear/screen/RenderTexture.h
+++ b/simgear/screen/RenderTexture.h
@@ -50,15 +50,15 @@
  */
 #include <simgear/compiler.h>
 
-#if !defined( _WIN32 ) && !defined( __MACH__ )
-#  include <X11/Xlib.h>
-#endif
-#include SG_GL_H
-#if defined( __MACH__)
+#include <osg/GL>
+
+#if defined( __APPLE__)
 #  include <OpenGL/OpenGL.h>
 #endif
-#ifndef _WIN32
-#  include SG_GLX_H
+
+#if !defined( _WIN32 ) && !defined( __APPLE__ )
+#  include <X11/Xlib.h>
+#  include <GL/glx.h>
 #endif
 
 #include <string>

diff --git a/simgear/screen/TestRenderTexture.cpp b/simgear/screen/TestRenderTexture.cpp
index 2c7fc236d2022680fc90781a615bcd0e75f26b96..2aa2e09f574adbc8a214fe5c52d629bfd3c724ef 100644 (file)
--- a/simgear/screen/TestRenderTexture.cpp
+++ b/simgear/screen/TestRenderTexture.cpp
@@ -9,8 +9,14 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GL_H
-#include SG_GLUT_H
+#include <osg/GL>
+
+#ifdef __APPLE__
+#  include <GLUT/glut.h>
+#else
+#  include <GL/glut.h>
+#endif
+
 #include <simgear/screen/extensions.hxx>
 #include <simgear/screen/RenderTexture.h>
 

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index 419655884f9b489e4af27c59859cac366d887234..a0c09fd42e4813cc10a504808bf63ce0fff55ab4 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -34,11 +34,13 @@
 
 #include <simgear/compiler.h>
 
-#if !defined(WIN32)
-# include SG_GLX_H
-#endif
-#include SG_GL_H
+#include <osg/GL>
 
+#if defined (WIN32)
+#  include <GL/wgl.h>
+#elif !defined(__APPLE__)
+#  include <GL/glx.h>
+#endif
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 8e23b8f2dc9d8d6e81636eaed839bc9d29be9066..b74f06c0592732601968c687c90e3d9d53be47b3 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -37,7 +37,7 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GL_H
+#include <osg/GL>
 
 #include "screen-dump.hxx"
 

diff --git a/simgear/screen/screen-dump.hxx b/simgear/screen/screen-dump.hxx
index 379802b1aad2d3b509bbada39bd7a3689d9d2abc..25a4c1967222224f1b191af780654a3d94cd7558 100644 (file)
--- a/simgear/screen/screen-dump.hxx
+++ b/simgear/screen/screen-dump.hxx
@@ -23,7 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GL_H
+#include <osg/GL>
 
 /**
  * Dump the screen buffer to a ppm file.

diff --git a/simgear/screen/texture.cxx b/simgear/screen/texture.cxx
index fd4aaf89a88f71ccc7ea685e7d35e859b640f76b..6f744c35dda23fece90a776141333658d6849c97 100644 (file)
--- a/simgear/screen/texture.cxx
+++ b/simgear/screen/texture.cxx
@@ -17,7 +17,7 @@
 # include <windows.h>
 #endif
 
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include <math.h>
 #include <zlib.h>

diff --git a/simgear/screen/texture.hxx b/simgear/screen/texture.hxx
index 9f76cadbd2390a4dfc87cad67782ebef4dc39715..bdded366a4d7b0515dee248f7525418725ea6568 100644 (file)
--- a/simgear/screen/texture.hxx
+++ b/simgear/screen/texture.hxx
@@ -14,7 +14,7 @@
 #define __SG_TEXTURE_HXX 1
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <zlib.h>
 
 #include <plib/sg.h>

diff --git a/simgear/screen/tr.cxx b/simgear/screen/tr.cxx
index 85e9f3a8acc16914bd915b83e5e92d3fec6d1a72..6c191a3d44b72d813712ba3b90221448c8a8e891 100644 (file)
--- a/simgear/screen/tr.cxx
+++ b/simgear/screen/tr.cxx
@@ -2,6 +2,21 @@
 
 /*
  * $Log$
+ * Revision 1.5  2008/07/27 16:10:37  ehofman
+ *
+ *
+ *  - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
+ *  - this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
+ *    extensions.hxx was pulling in all of Carbon to the global namespace
+ *    - very scary. As a result, I now need to explicitly include CoreFoundation
+ *    in fg_init.cxx.
+ *  - change SG_USING_STD(x) to using std::x
+ *
+ * Issues:
+ *
+ *  - the logic for X11 and Win32 in RenderTexture and extensions is tortured,
+ *    please see if you agree I got all the ifdefs correct.
+ *
  * Revision 1.4  2006/10/29 19:27:11  frohlich
  * Modified Files:
  *     configure.ac simgear/environment/visual_enviro.cxx
@@ -129,7 +144,7 @@
 #include <windows.h>
 #endif
 
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include "tr.h"
 

diff --git a/simgear/screen/tr.h b/simgear/screen/tr.h
index 8ef88bac833913c4f3862bdaa6f8b633af3488bf..57c13959067d99bc4ad0b8742e997c43277d66a4 100644 (file)
--- a/simgear/screen/tr.h
+++ b/simgear/screen/tr.h
@@ -2,6 +2,21 @@
 
 /*
  * $Log$
+ * Revision 1.4  2008/07/27 16:10:37  ehofman
+ *
+ *
+ *  - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
+ *  - this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
+ *    extensions.hxx was pulling in all of Carbon to the global namespace
+ *    - very scary. As a result, I now need to explicitly include CoreFoundation
+ *    in fg_init.cxx.
+ *  - change SG_USING_STD(x) to using std::x
+ *
+ * Issues:
+ *
+ *  - the logic for X11 and Win32 in RenderTexture and extensions is tortured,
+ *    please see if you agree I got all the ifdefs correct.
+ *
  * Revision 1.3  2006/02/21 10:47:21  ehofman
  * Back out the previous patch.
  *
@@ -85,7 +100,7 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GL_H
+#include <osg/GL>
 
 
 //#ifdef __cplusplus