Please submit complete modified files to Robert via the osg-submissions list so they can be committed.
On Wed, Feb 5, 2014 at 4:14 PM, Bengt Gustafsson < [email protected]> wrote: > Thanks Brandon! > > This almost worked, I got OSG compiled real quick and everything I have > tested works EXPCEPT (of course) the dae plugin. This dll seems to be > awfully wrong, the LoadLibrary() windows function complains that there is > no entry point. (The file is there and found, but is somehow damaged). > > There were a few small quirks I had to adjust in the source code to > compile with VS2013: > > > 1. Warning for a */* sequence in src\osg\notify.cpp:32 > > Solution: Add a space between * and /* > > 2. Error in src\osgPlugins\x\directx.cpp > > Tried to check if there was any data by assuming return value from > istream::getline is the char count. But it is the istream itself. > > Changed the code like this to make it correct: > > bool Object::load(std::istream& fin) > { > // read header > char buf[256]; > fin.getline(buf, sizeof(buf)); > > if (fin.gcount() == 0) { > OSG_WARN << "Failed to read DirectX header\n"; > return false; > } > > > 3. Missing header for std::min and std::max in src\osgText\Glyph.cpp > > Added #include <algorithm> at the top of the cpp file. > > 4. The same error in src\osgPlugin\dxf\dxfEntity.cpp > > 5. The same error in src\osgPlugin\txf\TXFFont.cpp > > 6. The gdal library shipped in the 3rdparty binaries is compiled with > VS2012 so the gdal.lib is not usable when compiling with VS2013. > > Now it seems that OSG itself is not using gdal which is probably why > this omission was not detected. > > I changed to using gdal_i.lib instead. Now it can't find gdal110.dll > although I > have c:\...\3rdParty_x86_x64\x86\bin in my "executable direcories" > setting. > > Setting this dir in path too fixed this, strangely enough. > > > That's all folks! > > > -- > Bengt Gustafsson > CEO, Beamways AB > Westmansgatan 37A > 582 16 Linköping, Sweden > +46 13 465 10 85 > www.beamways.com > > _______________________________________________ > osg-users mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org > -- Chris 'Xenon' Hanson, omo sanza lettere. [email protected] http://www.alphapixel.com/ Training * Consulting * Contracting 3D * Scene Graphs (Open Scene Graph/OSG) * OpenGL 2 * OpenGL 3 * OpenGL 4 * GLSL * OpenGL ES 1 * OpenGL ES 2 * OpenCL Digital Imaging * GIS * GPS * osgEarth * Terrain * Telemetry * Cryptography * Digital Audio * LIDAR * Kinect * Embedded * Mobile * iPhone/iPad/iOS * Android @alphapixel <https://twitter.com/alphapixel> facebook.com/alphapixel (775) 623-PIXL [7495]
_______________________________________________ osg-users mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
