Migrate FlightGear code to use "#include SG_GL*" defined in

"#include <simgear/compiler.h>".

diff --git a/configure.ac b/configure.ac
index a2c48a0fb79c8c31067cf6fd318a61ec9a7db8a5..98fed3d4f283bf1b6e7df194354f8b12bc463492 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -231,22 +231,6 @@ else
     AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
 fi
 
-dnl check for glut location
-AC_CHECK_HEADER(GL/glut.h)
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    AC_DEFINE([FG_GLUT_H], <GL/glut.h>, [Define as glut.h include location])
-else
-    AC_CHECK_HEADER(GLUT/glut.h)
-    if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([FG_GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
-    else
-        if test "x$enable_sdl" != "xyes"; then
-            echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-            exit
-        fi
-    fi
-fi
-
 dnl check for OpenGL related libraries
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)

diff --git a/src/ATC/ATCdisplay.cxx b/src/ATC/ATCdisplay.cxx
index 5de85e4d144bb1a187cf9d4f2abafc1187fdd132..0b3fa2a7f2b791ca781ccd94dd5fac7807f51e44 100644 (file)
--- a/src/ATC/ATCdisplay.cxx
+++ b/src/ATC/ATCdisplay.cxx
@@ -26,7 +26,9 @@
 #   include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <simgear/props/props.hxx>
 

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index 75e765ecc31004126ea13c541a4addd2cc77a8f7..97f844da90bd181a919d7136bfbad3e092deba73 100644 (file)
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -29,7 +29,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 9212f6e5fcf408898c40fe0b7fddebc4dca0f924..268bb943a257295ea486606ffda2b2453887e0dc 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -44,7 +44,7 @@
 #include <stdio.h>             // char related functions
 #include <string.h>            // strcmp()
 
-#include <GL/glu.h>
+#include SG_GLU_H
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 09194ef12de8cc31178e675b7a994227a78dd98b..4134c196cfa91f498c134949798c357a7ac19d83 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -29,7 +29,9 @@
 #include <stdio.h>     // sprintf
 #include <string.h>
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <plib/ssg.h>
 #include <plib/fnt.h>

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index c44e695779d0cb883b2ba7e34c67eb12cde87c4f..282929f3a6efd49fcf63545ee14f22ae7ccbf285 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -40,7 +40,7 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include SG_GL_H
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>

diff --git a/src/GUI/layout-test.cxx b/src/GUI/layout-test.cxx
index feb8f207f68e2ea67a593a5af74d43ccf2c0a4da..075da15a5d0b279aabe5f4e3240f085122cdb186 100644 (file)
--- a/src/GUI/layout-test.cxx
+++ b/src/GUI/layout-test.cxx
@@ -1,6 +1,7 @@
 #include <iostream>
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+#include SG_GL_H
 #include <plib/pw.h>
 #include <plib/pu.h>
 #include <simgear/props/props.hxx>

diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx
index fc404a00fabf5b755a1515132ba021009c12510e..067503834d100399a3e8db295ef8ae6faccfd013 100644 (file)
--- a/src/Main/fg_os.cxx
+++ b/src/Main/fg_os.cxx
@@ -1,16 +1,16 @@
-// The mac puts this in a weird location (GLUT/glut.h), so the
-// configure script detects the location and defines it as a macro.
 #ifndef _MSC_VER // MSVC really needs a definition for wchar_t
 #define _WCHAR_T_DEFINED 1 // Glut needs this, or else it tries to
                            // redefine it
 #endif
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
-#  include FG_GLUT_H
-#else
-#  include <GL/glut.h>
 #endif
 
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
+
 #include <plib/pu.h>
 
 #include "fg_props.hxx"

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index ce9d4361ea09fe8174a47c490c88fca5ecfd1621..a316e3b827eab549ede7c48542553d938c6bcaec 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -36,7 +36,9 @@
 
 #include <string.h>
 
-#include <GL/glu.h>
+#include <simgear/compiler.h>
+
+#include SG_GLU_H
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/screen/texture.hxx>

diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx
index d9419be7209649bd81765d466f491b3db00f03f3..e25b9b1ed1d0b5680625a7bd2a2fe079f6d409a0 100644 (file)
--- a/src/Network/net_fdm.hxx
+++ b/src/Network/net_fdm.hxx
@@ -48,8 +48,8 @@ public:
     float phi;                 // roll (radians)
     float theta;               // pitch (radians)
     float psi;                 // yaw or true heading (radians)
-    float alpha;                // angle of attack
-    float beta;                 // side slip angle
+    float alpha;                // angle of attack (radians)
+    float beta;                 // side slip angle (radians)
 
     // Velocities
     float phidot;              // roll rate (radians/sec)

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index b7378aeeff59a09cd28e86eda396e6ff24281a98..9103759118f16346ce165c528ab756ce160da1c1 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -30,10 +30,10 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
-
 #include <simgear/compiler.h>
 
+#include SG_GL_H
+
 #ifdef SG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
 #endif

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 2a24f0b5dce11f7f9b8f07ea41a73a62688cc6d5..fd4c215dc8392927cd5e2d977e26457a5cf90734 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -38,7 +38,9 @@
 #  include <windows.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include <plib/sg.h>                   // plib include
 

diff --git a/tests/est-epsilon.c b/tests/est-epsilon.c
index d51fa204cf0278238e50dcdd52550d422c34d3d0..3b0efaf806d07afda1cd63423a68392e15a1a5fd 100644 (file)
--- a/tests/est-epsilon.c
+++ b/tests/est-epsilon.c
@@ -8,7 +8,9 @@
 
 #include <stdio.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 
 int main() {

diff --git a/tests/gl-info.c b/tests/gl-info.c
index 6cc25d6d1588103dd9c2af2c89057f53345d5ca6..4aff41db650bb716bae89640294cf1f1771f7f6a 100644 (file)
--- a/tests/gl-info.c
+++ b/tests/gl-info.c
@@ -18,7 +18,9 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800
 #include <stdio.h>
 #include <stdlib.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 
 void getPrints ( GLenum token, char *string )

diff --git a/tests/test-env-map.cxx b/tests/test-env-map.cxx
index 6e372281f0abe610cb031bfb7aa1d9552b81defa..6d369efc620c3e44d9207efc1729c98e22c4a181 100644 (file)
--- a/tests/test-env-map.cxx
+++ b/tests/test-env-map.cxx
@@ -10,7 +10,9 @@
 #include <stdio.h>
 #include <math.h>
 
-#include FG_GLUT_H
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
 
 #define TEXRES_X 256
 #define TEXRES_Y 256

diff --git a/utils/Modeller/3dconvert.cxx b/utils/Modeller/3dconvert.cxx
index 6ffc1ac7b9062abd0fab246221bce27e22c29bf5..db9859e3e4ddc4ca1bbc83364aaf32c1c3bf3467 100644 (file)
--- a/utils/Modeller/3dconvert.cxx
+++ b/utils/Modeller/3dconvert.cxx
@@ -1,5 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
 #include <iostream>
-#include <GL/glut.h>
+
+#include SG_GLUT_H
+
 #include <plib/ssg.h>
 
 using std::cerr;