diff --git a/configure.ac b/configure.ac index a2c48a0fb..98fed3d4f 100644 --- 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], , [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], , [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 5de85e4d1..0b3fa2a7f 100644 --- a/src/ATC/ATCdisplay.cxx +++ b/src/ATC/ATCdisplay.cxx @@ -26,7 +26,9 @@ # include #endif -#include +#include + +#include SG_GLU_H #include diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx index 75e765ecc..97f844da9 100644 --- a/src/Cockpit/cockpit.cxx +++ b/src/Cockpit/cockpit.cxx @@ -29,7 +29,9 @@ # include #endif -#include +#include + +#include SG_GLU_H #include #include diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index 9212f6e5f..268bb943a 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -44,7 +44,7 @@ #include // char related functions #include // strcmp() -#include +#include SG_GLU_H #include #include diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx index 09194ef12..4134c196c 100644 --- a/src/Cockpit/panel.cxx +++ b/src/Cockpit/panel.cxx @@ -29,7 +29,9 @@ #include // sprintf #include -#include +#include + +#include SG_GLU_H #include #include diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx index c44e69577..282929f3a 100644 --- a/src/GUI/gui_funcs.cxx +++ b/src/GUI/gui_funcs.cxx @@ -40,7 +40,7 @@ # include #endif -#include +#include SG_GL_H #if defined(FX) && defined(XMESA) # include diff --git a/src/GUI/layout-test.cxx b/src/GUI/layout-test.cxx index feb8f207f..075da15a5 100644 --- a/src/GUI/layout-test.cxx +++ b/src/GUI/layout-test.cxx @@ -1,6 +1,7 @@ #include -#include +#include +#include SG_GL_H #include #include #include diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx index fc404a00f..067503834 100644 --- 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 -# include FG_GLUT_H -#else -# include #endif +#include + +#include SG_GLUT_H + #include #include "fg_props.hxx" diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx index ce9d4361e..a316e3b82 100644 --- a/src/Main/splash.cxx +++ b/src/Main/splash.cxx @@ -36,7 +36,9 @@ #include -#include +#include + +#include SG_GLU_H #include #include diff --git a/src/Network/net_fdm.hxx b/src/Network/net_fdm.hxx index d9419be72..e25b9b1ed 100644 --- 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 b7378aeef..910375911 100644 --- a/src/Time/light.cxx +++ b/src/Time/light.cxx @@ -30,10 +30,10 @@ # include #endif -#include - #include +#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 2a24f0b5d..fd4c215dc 100644 --- a/src/Time/light.hxx +++ b/src/Time/light.hxx @@ -38,7 +38,9 @@ # include #endif -#include +#include + +#include SG_GL_H #include // plib include diff --git a/tests/est-epsilon.c b/tests/est-epsilon.c index d51fa204c..3b0efaf80 100644 --- a/tests/est-epsilon.c +++ b/tests/est-epsilon.c @@ -8,7 +8,9 @@ #include -#include FG_GLUT_H +#include + +#include SG_GLUT_H int main() { diff --git a/tests/gl-info.c b/tests/gl-info.c index 6cc25d6d1..4aff41db6 100644 --- a/tests/gl-info.c +++ b/tests/gl-info.c @@ -18,7 +18,9 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800 #include #include -#include FG_GLUT_H +#include + +#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 6e372281f..6d369efc6 100644 --- a/tests/test-env-map.cxx +++ b/tests/test-env-map.cxx @@ -10,7 +10,9 @@ #include #include -#include FG_GLUT_H +#include + +#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 6ffc1ac7b..db9859e3e 100644 --- a/utils/Modeller/3dconvert.cxx +++ b/utils/Modeller/3dconvert.cxx @@ -1,5 +1,13 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include -#include + +#include SG_GLUT_H + #include using std::cerr;