Move SGReadFileCallback from model.cxx to public class ModelRegistry

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

diff --git a/simgear/math/SGMath.hxx b/simgear/math/SGMath.hxx
index 1bd807dd08216adc76198a1cdcdd4252b727d96f..3770408ce6939e5439d7850ee9e7292884f4b468 100644 (file)
--- a/simgear/math/SGMath.hxx
+++ b/simgear/math/SGMath.hxx
@@ -21,6 +21,11 @@
 /// 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"
 
@@ -28,6 +33,7 @@
 #include "SGLimits.hxx"
 #include "SGMisc.hxx"
 #include "SGGeodesy.hxx"
+#include "SGVec2.hxx"
 #include "SGVec3.hxx"
 #include "SGVec4.hxx"
 #include "SGGeoc.hxx"