make headers include headers they depend on, don't rely on the c(xx)

[simgear.git] / simgear / screen / tr.cxx

diff --git a/simgear/screen/tr.cxx b/simgear/screen/tr.cxx
index 6a8169c10f29857599dc6752a08fe57a2b6b1bf3..53e1bf820d24a0625a77ea0778854379cff1650d 100644 (file)
--- a/simgear/screen/tr.cxx
+++ b/simgear/screen/tr.cxx
@@ -2,6 +2,24 @@
 
 /*
  * $Log$
+ * Revision 1.3  2006/02/21 10:47:21  ehofman
+ * Back out the previous patch.
+ *
+ * Revision 1.2  2004/11/18 19:10:34  curt
+ * Abstract out location of gl.h, glut.h, and glu.h includes so that we can
+ * make the Mac platform happy since they put these in a different place compared
+ * to the rest of the world.
+ *
+ * Revision 1.1.1.1  2002/09/07 02:58:19  curt
+ * Initial revsion of Simgear-0.3.0
+ *
+ * Revision 1.3  2001/07/30 20:34:21  curt
+ * Various MSVC fixes.
+ *
+ * Revision 1.2  2001/06/27 02:48:01  curt
+ * Fixed a type conversion bug that could trip up some of the pickier compilers
+ * out there.
+ *
  * Revision 1.1  2001/06/26 15:19:39  curt
  * Added tr.cxx / tr.h, Brian Paul's LGPL'd tiled rendering support libs for
  * rendering ultra high res "tiled" screen shots.
@@ -43,6 +61,8 @@
  */
 
 
+#include <simgear/compiler.h>
+
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
@@ -50,8 +70,9 @@
 #ifdef WIN32
 #include <windows.h>
 #endif
-#include <GL/gl.h>
-#include <GL/glu.h>
+
+#include SG_GLU_H
+
 #include <plib/ssg.h>
 #include "tr.h"
 
@@ -377,7 +398,7 @@ void trBeginTile(TRcontext *tr)
    ssgSetFrustum ( left, right, bottom, top, tr->Near, tr->Far );
 
    /* restore user's matrix mode */
-   glMatrixMode(matrixMode);
+   glMatrixMode( (GLenum)matrixMode );
 }