Remove several unneeded glut dependencies. Note, this doesn't signal an

immediate end to glut, only that I'm going through and cleaning up (and
taking inventory of the actual glut dependencies in case I want to investigate
SDL.)

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index 3dd91cae214d8e81b17d4eb1ac0812087dcf4966..98ab091e8864b3f4c292f358e754332c85b69ab5 100644 (file)
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -29,7 +29,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 9f1d42445580d1c53691398b161d857fb0e43857..caf148b337f6a19333153df87e8a4a8d1ba32074 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -36,7 +36,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <plib/ssg.h>
 

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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index c093742e3a005fdd53c54a327590a437bf66c705..419d7e5fc2cd265d6944ca79b224a989f8a87855 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -31,12 +31,6 @@
 #  include <math.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include GLUT_H
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 27e455906075ec6811644d8aae7d0ac8e0049283..92ebb695fc45f53f0da187dd48a16b27f117c64c 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -30,7 +30,7 @@
 #  include <windows.h>
 #endif
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>