X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fobj.hxx;h=d07ec5d466a49cfa3a7a40a8951c6ad50c389711;hb=243b73c10b5385374a2d4bdfe48e5a85521c0bb3;hp=bed0908eda98956fa3630c1dbc70ee47d2462e6e;hpb=c90db01dc8d5462a3da22771ffa7c96f5ea31217;p=flightgear.git diff --git a/src/Objects/obj.hxx b/src/Objects/obj.hxx index bed0908ed..d07ec5d46 100644 --- a/src/Objects/obj.hxx +++ b/src/Objects/obj.hxx @@ -34,19 +34,25 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif +#include + +// #ifdef HAVE_WINDOWS_H +// # include +// #endif -#include +// #include -#include +#include STL_STRING + +#include // plib include #include +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