Moving towards increased dependence on ssg.

[flightgear.git] / src / Objects / obj.hxx

diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx
index bed0908eda98956fa3630c1dbc70ee47d2462e6e..d07ec5d466a49cfa3a7a40a8951c6ad50c389711 100644 (file)
--- a/src/Objects/obj.hxx
+++ b/src/Objects/obj.hxx
@@ -34,19 +34,25 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
+#include <Include/compiler.h>
+
+// #ifdef HAVE_WINDOWS_H
+// #  include <windows.h>
+// #endif
 
-#include <GL/glut.h>
+// #include <GL/glut.h>
 
-#include <string>
+#include STL_STRING
+
+#include <ssg.h>               // plib include
 
 #include <Scenery/tileentry.hxx>
 
+FG_USING_STD(string);
+
 
-// Load a .obj file and build the GL fragment list
-int fgObjLoad(const string& path, FGTileEntry *tile);
+// Load a .obj file and build the fragment list
+ssgBranch *fgObjLoad(const string& path, FGTileEntry *tile);
 
 
 #endif // _OBJ_HXX