Merge branch 'timoore/effects'

[simgear.git] / simgear / math / SGMath.hxx

diff --git a/simgear/math/SGMath.hxx b/simgear/math/SGMath.hxx
index 024fe4c19ee1194289ecc0b26d1f5954318420b0..d5fe3994305e2f4f5b2063af8ec4cdc764e857c7 100644 (file)
--- a/simgear/math/SGMath.hxx
+++ b/simgear/math/SGMath.hxx
@@ -21,15 +21,25 @@
 /// Just include them all
 
 #include <iosfwd>
+// FIXME, make it compile on IRIX
 
+//#include <osg/GL>
+//#undef GLUT_APIENTRY_DEFINED // GL/glut.h undef APIENTRY when this symbol is defined. osg/GL defines it (?).
+                             // This probably would work if we didn't use plib/pu.h that include GL/glut.h 
+                             //  on its side.
+
+#include "SGMathFwd.hxx"
+
+#include "SGCMath.hxx"
 #include "SGLimits.hxx"
 #include "SGMisc.hxx"
 #include "SGGeodesy.hxx"
+#include "SGVec2.hxx"
 #include "SGVec3.hxx"
 #include "SGVec4.hxx"
-#include "SGQuat.hxx"
-#include "SGMatrix.hxx"
 #include "SGGeoc.hxx"
 #include "SGGeod.hxx"
+#include "SGQuat.hxx"
+#include "SGMatrix.hxx"
 
 #endif