From: curt <curt>
Date: Mon, 11 Aug 2003 21:50:22 +0000 (+0000)
Subject: Remove several unneeded glut dependencies.  Note, this doesn't signal an
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bcb10efa504c12b4057d824e6f5e96d844503280;p=flightgear.git

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 3dd91cae2..98ab091e8 100644
--- 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 9f1d42445..caf148b33 100644
--- 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 8c17c1ebf..a9f4277a2 100644
--- 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 c093742e3..419d7e5fc 100644
--- 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 27e455906..92ebb695f 100644
--- 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>